http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index b5b83ad..3fd8a58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@ -54,11 +54,15 @@ 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; /** * Test for dynamic cache start. */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -140,6 +144,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCacheMultithreadedSameNode() throws Exception { final IgniteEx kernal = grid(0); @@ -206,6 +211,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartCacheMultithreadedDifferentNodes() throws Exception { final Collection<IgniteInternalFuture<?>> futs = new ConcurrentLinkedDeque<>(); @@ -274,6 +280,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCacheSimpleTransactional() throws Exception { checkStartStopCacheSimple(CacheAtomicityMode.TRANSACTIONAL); } @@ -281,6 +288,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCacheSimpleTransactionalMvcc() throws Exception { checkStartStopCacheSimple(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT); } @@ -288,6 +296,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCacheSimpleAtomic() throws Exception { checkStartStopCacheSimple(CacheAtomicityMode.ATOMIC); } @@ -295,6 +304,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCachesSimpleTransactional() throws Exception { checkStartStopCachesSimple(CacheAtomicityMode.TRANSACTIONAL); } @@ -302,6 +312,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCachesSimpleTransactionalMvcc() throws Exception { checkStartStopCachesSimple(CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT); } @@ -309,6 +320,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCachesSimpleAtomic() throws Exception { checkStartStopCachesSimple(CacheAtomicityMode.ATOMIC); } @@ -446,6 +458,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopCacheAddNode() throws Exception { final IgniteEx kernal = grid(0); @@ -498,6 +511,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeployFilter() throws Exception { try { testAttribute = false; @@ -564,6 +578,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFailWhenConfiguredCacheExists() throws Exception { GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -585,6 +600,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFailWhenOneOfConfiguredCacheExists() throws Exception { GridTestUtils.assertThrowsInherited(log, new Callable<Object>() { @Override public Object call() throws Exception { @@ -615,6 +631,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testClientCache() throws Exception { try { testAttribute = false; @@ -658,6 +675,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartFromClientNode() throws Exception { try { testAttribute = false; @@ -700,6 +718,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartNearCacheFromClientNode() throws Exception { try { testAttribute = false; @@ -745,6 +764,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testEvents() throws Exception { CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -816,6 +836,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearNodesCache() throws Exception { try { testAttribute = false; @@ -859,6 +880,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Test public void testGetOrCreate() throws Exception { try { final CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -920,6 +942,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ + @Test public void testGetOrCreateCollection() throws Exception { final int cacheCnt = 3; @@ -956,6 +979,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetOrCreateMultiNode() throws Exception { try { final AtomicInteger cnt = new AtomicInteger(); @@ -998,6 +1022,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetOrCreateMultiNodeTemplate() throws Exception { final AtomicInteger idx = new AtomicInteger(); @@ -1017,6 +1042,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetOrCreateNearOnlyMultiNode() throws Exception { checkGetOrCreateNear(true); } @@ -1024,6 +1050,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetOrCreateNearMultiNode() throws Exception { checkGetOrCreateNear(false); } @@ -1145,6 +1172,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testServerNodesLeftEvent() throws Exception { testAttribute = false; @@ -1199,6 +1227,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDaemonNode() throws Exception { daemon = true; @@ -1231,6 +1260,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAwaitPartitionMapExchange() throws Exception { IgniteCache cache = grid(0).getOrCreateCache(new CacheConfiguration(DYNAMIC_CACHE_NAME)); @@ -1256,6 +1286,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopWithClientJoin() throws Exception { Ignite ignite1 = ignite(1); @@ -1310,6 +1341,7 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStartStopSameCacheMultinode() throws Exception { final AtomicInteger idx = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java index 15d10fc..9988b72 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java @@ -29,10 +29,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 IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -59,6 +63,7 @@ public class IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testConcurrentStartStop() throws Exception { awaitPartitionMapExchange(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheWithConfigStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheWithConfigStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheWithConfigStartSelfTest.java index d366306..5c4bdca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheWithConfigStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheWithConfigStartSelfTest.java @@ -25,10 +25,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 IgniteDynamicCacheWithConfigStartSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -72,6 +76,7 @@ public class IgniteDynamicCacheWithConfigStartSelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testStartCacheOnClient() throws Exception { int srvCnt = 3; @@ -97,4 +102,4 @@ public class IgniteDynamicCacheWithConfigStartSelfTest extends GridCommonAbstrac stopAllGrids(); } } -} \ 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/IgniteDynamicClientCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java index 69bf233..e5289ff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicClientCacheStartSelfTest.java @@ -43,6 +43,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.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; @@ -55,6 +58,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTAN /** * Tests that cache specified in configuration start on client nodes. */ +@RunWith(JUnit4.class) public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTest { /** */ protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -91,6 +95,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testConfiguredCacheOnClientNode() throws Exception { ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -136,6 +141,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testNearCacheStartError() throws Exception { ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -175,6 +181,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testReplicatedCacheClient() throws Exception { ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -208,6 +215,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testReplicatedWithNearCacheClient() throws Exception { ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); @@ -243,6 +251,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testCreateCloseClientCache1() throws Exception { Ignite ignite0 = startGrid(0); @@ -268,6 +277,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testCreateCloseClientCache2_1() throws Exception { createCloseClientCache2(false); } @@ -275,6 +285,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testCreateCloseClientCache2_2() throws Exception { createCloseClientCache2(true); } @@ -282,6 +293,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartMultipleClientCaches() throws Exception { startMultipleClientCaches(null); } @@ -289,6 +301,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartMultipleClientCachesForGroup() throws Exception { startMultipleClientCaches("testGrp"); } @@ -380,6 +393,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ @SuppressWarnings("unchecked") + @Test public void testStartNewAndClientCaches() throws Exception { final int SRVS = 4; @@ -555,6 +569,7 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartClientCachesOnCoordinatorWithGroup() throws Exception { startGrids(3); @@ -602,4 +617,4 @@ public class IgniteDynamicClientCacheStartSelfTest extends GridCommonAbstractTes return !excludeNodes.contains(name); } } -} \ 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/IgniteExchangeFutureHistoryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java index a5930c9..7e5e178 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteExchangeFutureHistoryTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks that top value at {@link GridCachePartitionExchangeManager#exchangeFutures()} is the newest one. */ +@RunWith(JUnit4.class) public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -55,6 +59,7 @@ public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest { * * @throws Exception If failed. */ + @Test public void testExchangeFutures() throws Exception { GridCachePartitionExchangeManager mgr = ((IgniteKernal)grid(0)).internalCache(DEFAULT_CACHE_NAME).context().shared().exchange(); @@ -71,4 +76,4 @@ public class IgniteExchangeFutureHistoryTest extends IgniteCacheAbstractTest { assertEquals(futs.get(j), sortedFuts.get(j)); } } -} \ 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/IgniteGetNonPlainKeyReadThroughSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java index 21b09fc..e6202de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteGetNonPlainKeyReadThroughSelfTest.java @@ -35,10 +35,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; /** * Tests read through for non-{@link BinaryUtils#BINARY_CLS} keys. */ +@RunWith(JUnit4.class) public class IgniteGetNonPlainKeyReadThroughSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -113,6 +117,7 @@ public class IgniteGetNonPlainKeyReadThroughSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testGetNullRead() throws Exception { storeFactory = new StoreFactory(true); @@ -122,6 +127,7 @@ public class IgniteGetNonPlainKeyReadThroughSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testGetValueRead() throws Exception { storeFactory = new StoreFactory(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java index 5b6d7f3..cdfb8a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java @@ -26,16 +26,21 @@ import org.junit.Assert; import java.nio.ByteBuffer; import java.util.concurrent.ThreadLocalRandom; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Simple test for arbitrary CacheObject reading/writing. */ +@RunWith(JUnit4.class) public class IgniteIncompleteCacheObjectSelfTest extends GridCommonAbstractTest { /** * Test case when requested data cut on cache object header. * * @throws Exception If failed. */ + @Test public void testIncompleteObject() throws Exception { final byte[] data = new byte[1024]; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java index 7f3807e..f07020c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.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.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.managers.communication.GridIoPolicy.SYSTEM_POOL; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTILITY_CACHE_POOL; @@ -35,6 +38,7 @@ import static org.apache.ignite.internal.managers.communication.GridIoPolicy.UTI /** * Sanity test for cache types. */ +@RunWith(JUnit4.class) public class IgniteInternalCacheTypesTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -65,6 +69,7 @@ public class IgniteInternalCacheTypesTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheTypes() throws Exception { Ignite ignite0 = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java index b3e0e45..56fd4d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClassNameConflictTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; 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.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -53,6 +56,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * and {@link org.apache.ignite.internal.processors.marshaller.MappingProposedMessage} is sent * with not-null <b>conflictingClsName</b> field. */ +@RunWith(JUnit4.class) public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstractTest { /** */ private volatile boolean bbClsRejected; @@ -104,6 +108,7 @@ public class IgniteMarshallerCacheClassNameConflictTest extends GridCommonAbstra /** * @throws Exception If failed. */ + @Test public void testCachePutGetClassesWithNameConflict() throws Exception { Ignite srv1 = startGrid(0); Ignite srv2 = startGrid(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java index 057b970..da287a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheClientRequestsMappingOnMissTest.java @@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.internal.DiscoveryDataPacket; 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.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -49,6 +52,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for client requesting missing mappings from server nodes with and without server nodes failures. */ +@RunWith(JUnit4.class) public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCommonAbstractTest { /** * Need to point client node to a different working directory @@ -114,6 +118,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo /** * @throws Exception If failed. */ + @Test public void testRequestedMappingIsStoredInFS() throws Exception { Ignite srv1 = startGrid(0); @@ -151,6 +156,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo /** * @throws Exception If failed. */ + @Test public void testNoNodesDieOnRequest() throws Exception { Ignite srv1 = startGrid(0); @@ -181,6 +187,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo /** * */ + @Test public void testOneNodeDiesOnRequest() throws Exception { CountDownLatch nodeStopLatch = new CountDownLatch(1); @@ -216,6 +223,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo /** * */ + @Test public void testTwoNodesDieOnRequest() throws Exception { CountDownLatch nodeStopLatch = new CountDownLatch(2); @@ -252,6 +260,7 @@ public class IgniteMarshallerCacheClientRequestsMappingOnMissTest extends GridCo /** * */ + @Test public void testAllNodesDieOnRequest() throws Exception { CountDownLatch nodeStopLatch = new CountDownLatch(3); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java index 4e477f2..ca0b8b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheConcurrentReadWriteTest.java @@ -32,6 +32,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.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -40,6 +43,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -75,6 +79,7 @@ public class IgniteMarshallerCacheConcurrentReadWriteTest extends GridCommonAbst /** * @throws Exception If failed. */ + @Test public void testConcurrentReadWrite() throws Exception { Ignite ignite = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java index 47c01dc..15560d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMarshallerCacheFSRestoreTest.java @@ -44,10 +44,14 @@ import org.apache.ignite.spi.discovery.DiscoverySpiListener; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; 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 IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest { /** */ private volatile boolean isDuplicateObserved = true; @@ -128,6 +132,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest { * * This test must never hang on proposing of MarshallerMapping. */ + @Test public void testFileMappingReadAndPropose() throws Exception { isPersistenceEnabled = false; @@ -185,6 +190,7 @@ public class IgniteMarshallerCacheFSRestoreTest extends GridCommonAbstractTest { * @see <a href="https://issues.apache.org/jira/browse/IGNITE-6536";>IGNITE-6536</a> JIRA provides more information * about this case. */ + @Test public void testNodeStartFailsOnCorruptedStorage() throws Exception { isPersistenceEnabled = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java index 9e4609b..f7c434a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxMultiThreadedAbstractTest.java @@ -25,6 +25,9 @@ import org.apache.ignite.testframework.GridTestUtils; 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.transactions.TransactionConcurrency.PESSIMISTIC; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; @@ -32,6 +35,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Tests for local transactions. */ +@RunWith(JUnit4.class) public abstract class IgniteMvccTxMultiThreadedAbstractTest extends IgniteTxAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -40,6 +44,11 @@ public abstract class IgniteMvccTxMultiThreadedAbstractTest extends IgniteTxAbst super.beforeTestsStarted(); } + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9470";); + } + /** * @return Thread count. */ @@ -49,6 +58,7 @@ public abstract class IgniteMvccTxMultiThreadedAbstractTest extends IgniteTxAbst /** * @throws IgniteCheckedException If test failed. */ + @Test public void testPessimisticRepeatableReadCommitMultithreaded() throws Exception { checkCommitMultithreaded(PESSIMISTIC, REPEATABLE_READ); @@ -58,6 +68,7 @@ public abstract class IgniteMvccTxMultiThreadedAbstractTest extends IgniteTxAbst /** * @throws IgniteCheckedException If test failed. */ + @Test public void testPessimisticRepeatableReadRollbackMultithreaded() throws Exception { checkRollbackMultithreaded(PESSIMISTIC, REPEATABLE_READ); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxSingleThreadedAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxSingleThreadedAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxSingleThreadedAbstractTest.java index b9e7cee..51e96e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxSingleThreadedAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteMvccTxSingleThreadedAbstractTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.IgniteCheckedException; +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; @@ -25,10 +28,12 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Tests for local transactions. */ +@RunWith(JUnit4.class) public abstract class IgniteMvccTxSingleThreadedAbstractTest extends IgniteTxAbstractTest { /** * @throws IgniteCheckedException If test failed. */ + @Test public void testPessimisticRepeatableReadCommit() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10261";); @@ -40,6 +45,7 @@ public abstract class IgniteMvccTxSingleThreadedAbstractTest extends IgniteTxAbs /** * @throws IgniteCheckedException If test failed. */ + @Test public void testPessimisticRepeatableReadRollback() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10261";); @@ -47,4 +53,4 @@ public abstract class IgniteMvccTxSingleThreadedAbstractTest extends IgniteTxAbs finalChecks(); } -} \ 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/IgniteNearClientCacheCloseTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteNearClientCacheCloseTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteNearClientCacheCloseTest.java index 0ca0f3e..0bc9183 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteNearClientCacheCloseTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteNearClientCacheCloseTest.java @@ -39,6 +39,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.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -76,6 +80,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseAtomic1() throws Exception { nearCacheClose(1, false, ATOMIC); @@ -85,6 +90,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseAtomic2() throws Exception { nearCacheClose(4, false, ATOMIC); @@ -94,6 +100,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseTx1() throws Exception { nearCacheClose(1, false, TRANSACTIONAL); @@ -103,6 +110,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseTx2() throws Exception { nearCacheClose(4, false, TRANSACTIONAL); @@ -112,6 +120,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseMvccTx1() throws Exception { nearCacheClose(1, false, TRANSACTIONAL_SNAPSHOT); @@ -122,6 +131,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNearCacheCloseMvccTx2() throws Exception { nearCacheClose(4, false, TRANSACTIONAL_SNAPSHOT); @@ -184,6 +194,7 @@ public class IgniteNearClientCacheCloseTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdateAndNearCacheClose() throws Exception { final int SRVS = 4; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java index 423d257..e534567 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitInvokeTest.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.CacheRebalanceMode.ASYNC; @@ -45,6 +48,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -90,6 +94,7 @@ public class IgniteOnePhaseCommitInvokeTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testOnePhaseInvoke() throws Exception { boolean flags[] = {true, false}; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearReadersTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearReadersTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearReadersTest.java index f796cea..b4e2937 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearReadersTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearReadersTest.java @@ -35,6 +35,9 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionRollbackException; +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; @@ -43,6 +46,7 @@ import static org.apache.ignite.internal.TestRecordingCommunicationSpi.spi; /** * */ +@RunWith(JUnit4.class) public class IgniteOnePhaseCommitNearReadersTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -80,6 +84,7 @@ public class IgniteOnePhaseCommitNearReadersTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testPutReadersUpdate1() throws Exception { putReadersUpdate(1); } @@ -87,6 +92,7 @@ public class IgniteOnePhaseCommitNearReadersTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testPutReadersUpdate2() throws Exception { putReadersUpdate(0); } @@ -145,6 +151,7 @@ public class IgniteOnePhaseCommitNearReadersTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testPutReaderUpdatePrimaryFails1() throws Exception { putReaderUpdatePrimaryFails(1); } @@ -152,6 +159,7 @@ public class IgniteOnePhaseCommitNearReadersTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testPutReaderUpdatePrimaryFails2() throws Exception { putReaderUpdatePrimaryFails(0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java index 55323bb..542ca53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOnePhaseCommitNearSelfTest.java @@ -40,6 +40,9 @@ import javax.cache.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.transactions.TransactionConcurrency.*; import static org.apache.ignite.transactions.TransactionIsolation.*; @@ -47,6 +50,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Checks one-phase commit scenarios. */ +@RunWith(JUnit4.class) public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest { /** Grid count. */ private static final int GRID_CNT = 4; @@ -88,6 +92,7 @@ public class IgniteOnePhaseCommitNearSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testOnePhaseCommitFromNearNode() throws Exception { backups = 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java index e1f9420..bc988ec 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java @@ -37,10 +37,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; /** * */ +@RunWith(JUnit4.class) public class IgniteOutOfMemoryPropagationTest extends GridCommonAbstractTest { /** */ public static final int NODES = 3; @@ -66,11 +70,13 @@ public class IgniteOutOfMemoryPropagationTest extends GridCommonAbstractTest { } /** */ + @Test public void testPutOOMPropagation() throws Exception { testOOMPropagation(false); } /** */ + @Test public void testStreamerOOMPropagation() throws Exception { testOOMPropagation(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java index 76649bf..45e52e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -35,6 +35,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; @@ -43,6 +46,7 @@ import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; /** * Tests putAll method with large number of keys. */ +@RunWith(JUnit4.class) public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** Grid count. */ private static final int GRID_CNT = 4; @@ -87,6 +91,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllPessimisticOneBackupPartitioned() throws Exception { backups = 1; @@ -96,6 +101,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllPessimisticOneBackupNear() throws Exception { backups = 1; @@ -105,6 +111,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllOptimisticOneBackupPartitioned() throws Exception { backups = 1; @@ -114,6 +121,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllOptimisticOneBackupNear() throws Exception { backups = 1; @@ -123,6 +131,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllPessimisticTwoBackupsPartitioned() throws Exception { backups = 2; @@ -132,6 +141,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllPessimisticTwoBackupsNear() throws Exception { backups = 2; @@ -141,6 +151,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllOptimisticTwoBackupsPartitioned() throws Exception { backups = 2; @@ -150,6 +161,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAllOptimisticTwoBackupsNear() throws Exception { backups = 2; @@ -244,6 +256,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreviousValuePartitionedOneBackup() throws Exception { backups = 1; nearEnabled = false; @@ -254,6 +267,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreviousValuePartitionedTwoBackups() throws Exception { backups = 2; nearEnabled = false; @@ -264,6 +278,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreviousValueNearOneBackup() throws Exception { backups = 1; nearEnabled = true; @@ -274,6 +289,7 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPreviousValueNearTwoBackups() throws Exception { backups = 2; nearEnabled = true; @@ -312,4 +328,4 @@ public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { stopAllGrids(); } } -} \ 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/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java index 0f9e62b..99fc4c9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -28,6 +28,9 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCach 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.OPTIMISTIC; import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; @@ -35,6 +38,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Tests . */ +@RunWith(JUnit4.class) public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonAbstractTest { /** Grid count. */ private static final int GRID_CNT = 4; @@ -78,6 +82,7 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testPessimistic() throws Exception { backups = 2; @@ -137,4 +142,4 @@ public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonA stopAllGrids(); } } -} \ 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/IgniteStartCacheInTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java index f4d3b25..1d2a63f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java @@ -33,6 +33,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.transactions.TransactionConcurrency.PESSIMISTIC; @@ -41,6 +44,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Check starting cache in transaction. */ +@RunWith(JUnit4.class) public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -91,6 +95,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartCache() throws Exception { final Ignite ignite = grid(0); @@ -117,6 +122,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartConfigurationCache() throws Exception { final Ignite ignite = grid(0); @@ -143,6 +149,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStartConfigurationCacheWithNear() throws Exception { final Ignite ignite = grid(0); @@ -169,6 +176,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testGetOrCreateCache() throws Exception { final Ignite ignite = grid(0); @@ -195,6 +203,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testGetOrCreateCacheConfiguration() throws Exception { final Ignite ignite = grid(0); @@ -221,6 +230,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testStopCache() throws Exception { final Ignite ignite = grid(0); @@ -247,6 +257,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testLockCache() throws Exception { if (atomicityMode() != TRANSACTIONAL) return; @@ -271,4 +282,4 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes lock.unlock(); } -} \ 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/IgniteStaticCacheStartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java index 0c64a79..75a924e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStaticCacheStartSelfTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests cache deploy on topology from static configuration. */ +@RunWith(JUnit4.class) public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest { /** */ private static final String CACHE_NAME = "TestCache"; @@ -58,6 +62,7 @@ public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDeployCacheOnNodeStart() throws Exception { startGrids(3); @@ -99,4 +104,4 @@ public class IgniteStaticCacheStartSelfTest extends GridCommonAbstractTest { stopAllGrids(); } } -} \ 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/IgniteSystemCacheOnClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java index 9c864e6..1333983 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java @@ -26,10 +26,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 IgniteSystemCacheOnClientTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -49,6 +53,7 @@ public class IgniteSystemCacheOnClientTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSystemCacheOnClientNode() throws Exception { startGrids(2); @@ -63,4 +68,4 @@ public class IgniteSystemCacheOnClientTest extends GridCommonAbstractTest { assertEquals(1, affNodes.size()); assertTrue(affNodes.contains(ignite(0).cluster().localNode())); } -} \ 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/IgniteTopologyValidatorAbstractCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java index bb61632..b264da3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractCacheTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TopologyValidator; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Topology validator test. */ +@RunWith(JUnit4.class) public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCacheAbstractTest implements Serializable { /** key-value used at test. */ private static String KEY_VAL = "1"; @@ -240,6 +244,7 @@ public abstract class IgniteTopologyValidatorAbstractCacheTest extends IgniteCac /** * @throws Exception If failed. */ + @Test public void testTopologyValidator() throws Exception { putValid(DEFAULT_CACHE_NAME); remove(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/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java index 574a4de..a56ccea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java @@ -21,6 +21,9 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; @@ -30,6 +33,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Topology validator test */ +@RunWith(JUnit4.class) public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest extends IgniteTopologyValidatorCacheGroupsAbstractTest { /** {@inheritDoc} */ @@ -43,6 +47,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest } /** {@inheritDoc} */ + @Test @Override public void testTopologyValidator() throws Exception { try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); @@ -154,4 +159,4 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest remove(DEFAULT_CACHE_NAME); remove(CACHE_NAME_3); } -} \ 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/IgniteTopologyValidatorAbstractTxCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java index 817fda3..ecb62ae 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java @@ -21,6 +21,9 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; @@ -30,6 +33,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Topology validator test */ +@RunWith(JUnit4.class) public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteTopologyValidatorAbstractCacheTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -42,6 +46,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT } /** {@inheritDoc} */ + @Test @Override public void testTopologyValidator() throws Exception { try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); @@ -129,4 +134,4 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT remove(DEFAULT_CACHE_NAME); remove(CACHE_NAME_2); } -} \ 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/IgniteTopologyValidatorCacheGroupsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheGroupsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheGroupsAbstractTest.java index 8613225..b420910 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheGroupsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheGroupsAbstractTest.java @@ -23,10 +23,14 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.TopologyValidator; import org.apache.ignite.internal.util.typedef.F; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public abstract class IgniteTopologyValidatorCacheGroupsAbstractTest extends IgniteTopologyValidatorAbstractCacheTest { /** group name 1. */ protected static final String GROUP_1 = "group1"; @@ -79,6 +83,7 @@ public abstract class IgniteTopologyValidatorCacheGroupsAbstractTest extends Ign /** * @throws Exception If failed. */ + @Test @Override public void testTopologyValidator() throws Exception { putValid(DEFAULT_CACHE_NAME); remove(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/IgniteTopologyValidatorGridSplitCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java index 60a4b6d..4fa3d8f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorGridSplitCacheTest.java @@ -43,6 +43,9 @@ import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.MvccFeatureChecker; +import org.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.PRIMARY_SYNC; @@ -53,6 +56,7 @@ import static org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi.DFLT_PORT; * #DC_NODE_ATTR}. If only nodes from single DC are left in topology, grid is moved into inoperative state until special * activator node'll enter a topology, enabling grid operations. */ +@RunWith(JUnit4.class) public class IgniteTopologyValidatorGridSplitCacheTest extends IgniteCacheTopologySplitAbstractTest { /** */ private static final String DC_NODE_ATTR = "dc"; @@ -224,6 +228,7 @@ public class IgniteTopologyValidatorGridSplitCacheTest extends IgniteCacheTopolo * * @throws Exception If failed. */ + @Test public void testTopologyValidator() throws Exception { testTopologyValidator0(false); } @@ -233,6 +238,7 @@ public class IgniteTopologyValidatorGridSplitCacheTest extends IgniteCacheTopolo * * @throws Exception If failed. */ + @Test public void testTopologyValidatorWithCacheGroup() throws Exception { testTopologyValidator0(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java index 5fb0766..24ad582 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConcurrentGetAbstractTest.java @@ -29,6 +29,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.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; @@ -36,6 +39,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Checks multithreaded put/get cache operations on one node. */ +@RunWith(JUnit4.class) public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstractTest { /** Debug flag. */ private static final boolean DEBUG = false; @@ -88,6 +92,7 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra * * @throws Exception If failed. */ + @Test public void testPutGet() throws Exception { // Random key. final String key = UUID.randomUUID().toString(); @@ -138,4 +143,4 @@ public abstract class IgniteTxConcurrentGetAbstractTest extends GridCommonAbstra return val; } } -} \ 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/IgniteTxConfigCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java index a8a7f33..1cce53f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java @@ -48,6 +48,9 @@ import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionTimeoutException; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; @@ -56,6 +59,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Test checks that grid transaction configuration doesn't influence system caches. */ +@RunWith(JUnit4.class) public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest { /** Ip finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -109,6 +113,7 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testUserTxTimeout() throws Exception { if (MvccFeatureChecker.forcedMvcc()) fail("https://issues.apache.org/jira/browse/IGNITE-7952";); @@ -126,6 +131,7 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testSystemCacheTx() throws Exception { final Ignite 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/IgniteTxExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java index 6033ace..7d62d4f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionHeuristicException; 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.CacheMode.LOCAL; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -54,6 +57,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** * Tests that transaction is invalidated in case of {@link IgniteTxHeuristicCheckedException}. */ +@RunWith(JUnit4.class) public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstractSelfTest { /** */ private static final int PRIMARY = 0; @@ -133,6 +137,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutNear() throws Exception { checkPut(true, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -142,6 +147,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutPrimary() throws Exception { checkPut(true, keyForNode(grid(0).localNode(), PRIMARY)); @@ -151,6 +157,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutBackup() throws Exception { checkPut(true, keyForNode(grid(0).localNode(), BACKUP)); @@ -160,6 +167,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutAll() throws Exception { checkPutAll(true, keyForNode(grid(0).localNode(), PRIMARY), keyForNode(grid(0).localNode(), PRIMARY), @@ -183,6 +191,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testRemoveNear() throws Exception { checkRemove(false, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -192,6 +201,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testRemovePrimary() throws Exception { if (MvccFeatureChecker.forcedMvcc()) fail("https://issues.apache.org/jira/browse/IGNITE-9470";); @@ -204,6 +214,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testRemoveBackup() throws Exception { checkRemove(false, keyForNode(grid(0).localNode(), BACKUP)); @@ -213,6 +224,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testTransformNear() throws Exception { checkTransform(false, keyForNode(grid(0).localNode(), NOT_PRIMARY_AND_BACKUP)); @@ -222,6 +234,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testTransformPrimary() throws Exception { checkTransform(false, keyForNode(grid(0).localNode(), PRIMARY)); @@ -231,6 +244,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testTransformBackup() throws Exception { checkTransform(false, keyForNode(grid(0).localNode(), BACKUP)); @@ -240,6 +254,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutNearTx() throws Exception { for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { for (TransactionIsolation isolation : TransactionIsolation.values()) { @@ -253,6 +268,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutPrimaryTx() throws Exception { for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { for (TransactionIsolation isolation : TransactionIsolation.values()) { @@ -266,6 +282,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutBackupTx() throws Exception { for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { for (TransactionIsolation isolation : TransactionIsolation.values()) { @@ -279,6 +296,7 @@ public abstract class IgniteTxExceptionAbstractSelfTest extends GridCacheAbstrac /** * @throws Exception If failed. */ + @Test public void testPutMultipleKeysTx() throws Exception { for (TransactionConcurrency concurrency : TransactionConcurrency.values()) { for (TransactionIsolation isolation : TransactionIsolation.values()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java index 7c92154..a4423a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java @@ -50,6 +50,9 @@ 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.jetbrains.annotations.Nullable; +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; @@ -58,6 +61,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Checks basic multi-node transactional operations. */ +@RunWith(JUnit4.class) public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTest { /** Debug flag. */ private static final boolean DEBUG = false; @@ -489,6 +493,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testPutOneEntryInTx() throws Exception { // resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName()); @@ -509,6 +514,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testPutTwoEntriesInTx() throws Exception { // resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName()); @@ -533,6 +539,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testPutOneEntryInTxMultiThreaded() throws Exception { // resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName()); @@ -572,6 +579,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testPutTwoEntryInTxMultiThreaded() throws Exception { // resetLog4j(Level.INFO, true, GridCacheTxManager.class.getName()); @@ -612,6 +620,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testRemoveInTxQueried() throws Exception { //resetLog4j(Level.INFO, true, GridCacheTxManager.class.getPackage().getName()); @@ -654,6 +663,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testRemoveInTxSimple() throws Exception { startGrids(GRID_CNT); @@ -700,6 +710,7 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe * * @throws Exception If failed. */ + @Test public void testRemoveInTxQueriedMultiThreaded() throws Exception { //resetLog4j(Level.INFO, true, GridCacheTxManager.class.getPackage().getName()); @@ -896,4 +907,4 @@ public abstract class IgniteTxMultiNodeAbstractTest extends GridCommonAbstractTe return S.toString(RemoveInTxJobSimple.class, this); } } -} \ No newline at end of file +}
