http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java index ad03bf5..00dcc1f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java @@ -41,6 +41,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.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; @@ -55,6 +58,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.SERIALIZABLE; /** * */ +@RunWith(JUnit4.class) public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTest { /** */ private static final int EXPECTED_VALUE = 42; @@ -112,6 +116,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticOnePhaseCommit() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1); @@ -125,6 +130,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticOnePhaseCommitWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -139,6 +145,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticOnePhaseCommitFullSync() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1); @@ -152,6 +159,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticOnePhaseCommitFullSyncWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -166,6 +174,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimistic() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2); @@ -179,6 +188,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -193,6 +203,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticFullSync() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2); @@ -206,6 +217,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPessimisticFullSyncWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -219,6 +231,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimisticOnePhaseCommit() { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1).setAtomicityMode(TRANSACTIONAL_SNAPSHOT); @@ -238,6 +251,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimisticOnePhaseCommitFullSync() { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1).setAtomicityMode(TRANSACTIONAL_SNAPSHOT); @@ -246,6 +260,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimisticOnePhaseCommitFullSyncWithNearCache() { fail("https://issues.apache.org/jira/browse/IGNITE-7187";); @@ -257,6 +272,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimistic() { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2).setAtomicityMode(TRANSACTIONAL_SNAPSHOT); @@ -265,6 +281,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimisticWithNearCache() { fail("https://issues.apache.org/jira/browse/IGNITE-7187";); @@ -276,6 +293,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** */ + @Test public void testMvccPessimisticFullSync() { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2).setAtomicityMode(TRANSACTIONAL_SNAPSHOT); @@ -285,6 +303,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testMvccPessimisticFullSyncWithNearCache() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7187";); @@ -301,6 +320,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticOnePhaseCommit() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1); @@ -314,6 +334,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticOnePhaseCommitWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 1) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -328,6 +349,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticOnePhaseCommitFullSync() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1); @@ -341,6 +363,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticOnePhaseCommitFullSyncWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 1) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -355,6 +378,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimistic() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2); @@ -368,6 +392,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(PRIMARY_SYNC, 2) .setNearConfiguration(new NearCacheConfiguration<>()); @@ -382,6 +407,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticFullSync() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2); @@ -395,6 +421,7 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testOptimisticFullSyncWithNearCache() throws Exception { CacheConfiguration ccfg = cacheConfiguration(FULL_SYNC, 2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java index 0684d1f..b3a0a45 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationNearEnabledTest.java @@ -21,10 +21,14 @@ import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheKeepBinaryIterationNearEnabledTest extends CacheKeepBinaryIterationTest { /** {@inheritDoc} */ @Override protected CacheConfiguration<Object, Object> cacheConfiguration( @@ -40,11 +44,13 @@ public class CacheKeepBinaryIterationNearEnabledTest extends CacheKeepBinaryIter } /** {@inheritDoc} */ + @Test @Override public void testMvccTxOnHeap() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7187";); + fail("https://issues.apache.org/jira/browse/IGNITE-7187";); } /** {@inheritDoc} */ + @Test @Override public void testMvccTxOnHeapLocalEntries() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7187";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java index 910ce4a..af1f582 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationStoreEnabledTest.java @@ -24,10 +24,14 @@ import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cache.store.CacheStoreAdapter; import org.apache.ignite.configuration.CacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheKeepBinaryIterationStoreEnabledTest extends CacheKeepBinaryIterationTest { /** Cache store. */ private static TestStore store = new TestStore(); @@ -51,11 +55,13 @@ public class CacheKeepBinaryIterationStoreEnabledTest extends CacheKeepBinaryIte } /** {@inheritDoc} */ + @Test @Override public void testMvccTxOnHeap() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-8582";); } /** {@inheritDoc} */ + @Test @Override public void testMvccTxOnHeapLocalEntries() 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/query/continuous/CacheKeepBinaryIterationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java index 842b6f4..6fd429b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.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.config.GridTestProperties; 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; @@ -47,6 +50,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -81,6 +85,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAtomicOnHeap() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, ATOMIC); @@ -93,6 +98,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxOnHeap() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,1, TRANSACTIONAL); @@ -105,6 +111,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccTxOnHeap() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED,1, TRANSACTIONAL_SNAPSHOT); @@ -117,6 +124,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAtomicOnHeapLocalEntries() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, ATOMIC); @@ -129,6 +137,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxOnHeapLocalEntries() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL); @@ -141,6 +150,7 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMvccTxOnHeapLocalEntries() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL_SNAPSHOT); @@ -394,4 +404,4 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest { return S.toString(QueryTestValue.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/query/continuous/ClientReconnectContinuousQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java index 9ec25d3..bbdbb1e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ClientReconnectContinuousQueryTest.java @@ -38,10 +38,14 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { /** Client index. */ private static final int CLIENT_IDX = 1; @@ -102,6 +106,7 @@ public class ClientReconnectContinuousQueryTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testClientReconnect() throws Exception { try { startGrids(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryMarshallerTest.java index 44dcc1c..4da0074 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryMarshallerTest.java @@ -40,10 +40,14 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.custom.DummyEventFilterFactory; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks that Optimized Marshaller is not used on any stage of Continuous Query handling. */ +@RunWith(JUnit4.class) public class ContinuousQueryMarshallerTest extends GridCommonAbstractTest { /** */ public static final String CACHE_NAME = "test-cache"; @@ -65,6 +69,7 @@ public class ContinuousQueryMarshallerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemoteFilterFactoryClient() throws Exception { check("server", "client"); } @@ -72,6 +77,7 @@ public class ContinuousQueryMarshallerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testRemoteFilterFactoryServer() throws Exception { check("server1", "server2"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryPeerClassLoadingTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryPeerClassLoadingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryPeerClassLoadingTest.java index 73d8d0d..72fa404 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryPeerClassLoadingTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryPeerClassLoadingTest.java @@ -29,10 +29,14 @@ import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.custom.DummyEventFilterFactory; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks if filter factory correctly deployed on all nodes. */ +@RunWith(JUnit4.class) public class ContinuousQueryPeerClassLoadingTest extends GridCommonAbstractTest { /** */ public static final String CACHE_NAME = "test-cache"; @@ -55,6 +59,7 @@ public class ContinuousQueryPeerClassLoadingTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testRemoteFilterFactoryClient() throws Exception { check("server", "client1", "client2"); } @@ -62,6 +67,7 @@ public class ContinuousQueryPeerClassLoadingTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testRemoteFilterFactoryServer1() throws Exception { check("server1", "server2", "client"); } @@ -69,6 +75,7 @@ public class ContinuousQueryPeerClassLoadingTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testRemoteFilterFactoryServer2() throws Exception { check("server1", "server2", "server3"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryReassignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryReassignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryReassignmentTest.java index 2a537ca..9722b83 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryReassignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryReassignmentTest.java @@ -30,12 +30,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.testframework.GridTestUtils.waitForCondition; /** * */ +@RunWith(JUnit4.class) public class ContinuousQueryReassignmentTest extends GridCommonAbstractTest { /** Ip finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -63,6 +67,7 @@ public class ContinuousQueryReassignmentTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testContinuousQueryNotCalledOnReassignment() throws Exception { testContinuousQueryNotCalledOnReassignment(false); } @@ -70,6 +75,7 @@ public class ContinuousQueryReassignmentTest extends GridCommonAbstractTest { /** * @throws Exception if failed. */ + @Test public void testLocalContinuousQueryNotCalledOnReassignment() throws Exception { testContinuousQueryNotCalledOnReassignment(true); } @@ -114,6 +120,7 @@ public class ContinuousQueryReassignmentTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testContinuousQueryWithRemoteFilterNotCalledOnReassignment() throws Exception { Ignite lsnrNode = startGrid(1); Ignite victim = startGrid(2); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java index 226302f..74f9248 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/ContinuousQueryRemoteFilterMissingInClassPathSelfTest.java @@ -36,10 +36,14 @@ import javax.cache.event.CacheEntryUpdatedListener; import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridCommonAbstractTest { /** URL of classes. */ private static final URL[] URLS; @@ -97,6 +101,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC /** * @throws Exception If fail. */ + @Test public void testWarningMessageOnClientNode() throws Exception { ldr = new URLClassLoader(URLS, getClass().getClassLoader()); @@ -121,6 +126,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC /** * @throws Exception If fail. */ + @Test public void testNoWarningMessageOnClientNode() throws Exception { ldr = new URLClassLoader(URLS, getClass().getClassLoader()); @@ -143,6 +149,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC /** * @throws Exception If fail. */ + @Test public void testExceptionOnServerNode() throws Exception { ldr = new URLClassLoader(URLS, getClass().getClassLoader()); @@ -168,6 +175,7 @@ public class ContinuousQueryRemoteFilterMissingInClassPathSelfTest extends GridC /** * @throws Exception If fail. */ + @Test public void testNoExceptionOnServerNode() throws Exception { ldr = new URLClassLoader(URLS, getClass().getClassLoader()); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index a11b147..11757b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -73,6 +73,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 java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -91,6 +94,7 @@ import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.C /** * Continuous queries tests. */ +@RunWith(JUnit4.class) public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommonAbstractTest implements Serializable { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -265,6 +269,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testIllegalArguments() throws Exception { final ContinuousQuery<Object, Object> q = new ContinuousQuery<>(); @@ -307,6 +312,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testAllEntries() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -373,6 +379,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testFilterException() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -399,6 +406,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testTwoQueryListener() throws Exception { if (cacheMode() == LOCAL) return; @@ -454,6 +462,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testBackupCleanerTaskFinalize() throws Exception { final String CACHE_NAME = "LOCAL_CACHE"; @@ -478,6 +487,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testRestartQuery() throws Exception { if (cacheMode() == LOCAL) return; @@ -531,6 +541,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testEntriesByFilter() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -600,6 +611,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testLocalNodeOnly() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -671,6 +683,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testBuffering() throws Exception { if (grid(0).cache(DEFAULT_CACHE_NAME).getConfiguration(CacheConfiguration.class).getCacheMode() != PARTITIONED) return; @@ -756,6 +769,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testTimeInterval() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -836,6 +850,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testInitialQuery() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -881,6 +896,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testInitialQueryAndUpdates() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -943,6 +959,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testLoadCache() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -976,6 +993,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testInternalKey() throws Exception { if (atomicityMode() == ATOMIC) return; @@ -1016,6 +1034,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo * @throws Exception If failed. */ @SuppressWarnings("TryFinallyCanBeTryWithResources") + @Test public void testNodeJoinWithoutCache() throws Exception { IgniteCache<Integer, Integer> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -1048,6 +1067,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testEvents() throws Exception { final AtomicInteger cnt = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch(50); @@ -1143,6 +1163,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testExpired() throws Exception { IgniteCache<Object, Object> cache = grid(0).cache(DEFAULT_CACHE_NAME). withExpiryPolicy(new CreatedExpiryPolicy(new Duration(MILLISECONDS, 1000))); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java index 36754ec..bb397b4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAtomicSelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Continuous queries tests for atomic cache. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryAtomicSelfTest extends GridCacheContinuousQueryPartitionedSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -37,7 +41,8 @@ public class GridCacheContinuousQueryAtomicSelfTest extends GridCacheContinuousQ } /** {@inheritDoc} */ + @Test @Override public void testInternalKey() throws Exception { // No-op. } -} \ 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/query/continuous/GridCacheContinuousQueryConcurrentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java index 9dca5ea..1d6d6cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java @@ -53,6 +53,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.Executors.newSingleThreadExecutor; import static java.util.concurrent.TimeUnit.MINUTES; @@ -62,6 +65,7 @@ import static javax.cache.configuration.FactoryBuilder.factoryOf; * */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -100,6 +104,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testReplicatedTx() throws Exception { testRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL, 1)); } @@ -107,6 +112,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testReplicatedMvccTx() throws Exception { testRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT, 1)); } @@ -114,6 +120,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testRestartReplicated() throws Exception { testRestartRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC, 2)); } @@ -121,6 +128,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testRestartPartition() throws Exception { testRestartRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC, 2)); } @@ -128,6 +136,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testRestartPartitionTx() throws Exception { testRestartRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL, 2)); } @@ -135,6 +144,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testRestartPartitionMvccTx() throws Exception { testRestartRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT, 2)); } @@ -142,6 +152,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testReplicatedAtomic() throws Exception { testRegistration(cacheConfiguration(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC, 2)); } @@ -149,6 +160,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPartitionTx() throws Exception { testRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL, 2)); } @@ -156,6 +168,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPartitionMvccTx() throws Exception { testRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT, 2)); } @@ -163,6 +176,7 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testPartitionAtomic() throws Exception { testRegistration(cacheConfiguration(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC, 2)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java index d567dd9..663a66c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryMultiNodesFilteringTest.java @@ -55,6 +55,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -63,6 +66,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -89,6 +93,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA } /** */ + @Test public void testFiltersAndListeners() throws Exception { for (int i = 1; i <= SERVER_GRIDS_COUNT; i++) startGrid(i, false); @@ -146,6 +151,7 @@ public class GridCacheContinuousQueryMultiNodesFilteringTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testWithNodeFilter() throws Exception { List<QueryCursor> qryCursors = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java index 1679b90..519b674 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryNodesFilteringTest.java @@ -36,9 +36,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridStringLogger; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** */ @SuppressWarnings("unused") +@RunWith(JUnit4.class) public class GridCacheContinuousQueryNodesFilteringTest extends GridCommonAbstractTest implements Serializable { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -51,6 +55,7 @@ public class GridCacheContinuousQueryNodesFilteringTest extends GridCommonAbstra * * @throws Exception if failed. */ + @Test public void testNodeWithoutAttributeExclusion() throws Exception { try (Ignite node1 = startNodeWithCache()) { try (Ignite node2 = startGrid("node2", getConfiguration("node2", false, null))) { @@ -64,6 +69,7 @@ public class GridCacheContinuousQueryNodesFilteringTest extends GridCommonAbstra * * @throws Exception if failed. */ + @Test public void testNodeWithAttributeFailure() throws Exception { try (Ignite node1 = startNodeWithCache()) { GridStringLogger log = new GridStringLogger(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java index 8cf26ac..fe282a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryPartitionedOnlySelfTest.java @@ -19,12 +19,16 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * Continuous queries tests for partitioned cache. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryPartitionedOnlySelfTest extends GridCacheContinuousQueryAbstractSelfTest { /** {@inheritDoc} */ @Override protected NearCacheConfiguration nearConfiguration() { @@ -42,7 +46,8 @@ public class GridCacheContinuousQueryPartitionedOnlySelfTest extends GridCacheCo } /** {@inheritDoc} */ + @Test @Override public void testInternalKey() throws Exception { // Disabled since data structures are not allowed in partitioned only mode. } -} \ 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/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java index 4432eae..27fb0fd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedAtomicSelfTest.java @@ -18,12 +18,16 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheAtomicityMode; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** * Continuous queries tests for replicated atomic cache. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryReplicatedAtomicSelfTest extends GridCacheContinuousQueryReplicatedSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -31,7 +35,8 @@ public class GridCacheContinuousQueryReplicatedAtomicSelfTest extends GridCacheC } /** {@inheritDoc} */ + @Test @Override public void testInternalKey() throws Exception { // No-op. } -} \ 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/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java index 863bc80..b4043b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java @@ -27,6 +27,9 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; +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.CacheMode.REPLICATED; @@ -34,6 +37,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** * Continuous queries tests for replicated cache. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinuousQueryAbstractSelfTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -48,6 +52,7 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu /** * @throws Exception If failed. */ + @Test public void testRemoteNodeCallback() throws Exception { IgniteCache<Integer, Integer> cache1 = grid(0).cache(DEFAULT_CACHE_NAME); IgniteCache<Integer, Integer> cache2 = grid(1).cache(DEFAULT_CACHE_NAME); @@ -87,6 +92,7 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu * * @throws Exception If failed. */ + @Test public void testCrossCallback() throws Exception { // Prepare. IgniteCache<Integer, Integer> cache1 = grid(0).cache(DEFAULT_CACHE_NAME); @@ -132,4 +138,4 @@ public class GridCacheContinuousQueryReplicatedSelfTest extends GridCacheContinu assert latch2.await(LATCH_TIMEOUT, MILLISECONDS); } } -} \ 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/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java index d761289..98fadcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedTxOneNodeTest.java @@ -36,10 +36,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; /** * Test for replicated cache with one node. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -87,6 +91,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testLocal() throws Exception { if (cacheMode() == CacheMode.REPLICATED) doTest(true); @@ -95,6 +100,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testDistributed() throws Exception { doTest(false); } @@ -102,6 +108,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testLocalOneNode() throws Exception { doTestOneNode(true); } @@ -109,6 +116,7 @@ public class GridCacheContinuousQueryReplicatedTxOneNodeTest extends GridCommonA /** * @throws Exception If failed. */ + @Test public void testDistributedOneNode() throws Exception { doTestOneNode(false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxSelfTest.java index 91b6b9c..84b006c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryTxSelfTest.java @@ -20,12 +20,16 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.configuration.NearCacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; /** * Continuous queries tests for atomic cache. */ +@RunWith(JUnit4.class) public class GridCacheContinuousQueryTxSelfTest extends GridCacheContinuousQueryPartitionedSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { @@ -43,7 +47,8 @@ public class GridCacheContinuousQueryTxSelfTest extends GridCacheContinuousQuery } /** {@inheritDoc} */ + @Test @Override public void testInternalKey() throws Exception { // No-op. } -} \ 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/query/continuous/IgniteCacheContinuousQueryBackupQueueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryBackupQueueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryBackupQueueTest.java index a8f0d71..9be79da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryBackupQueueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryBackupQueueTest.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.CacheMode.PARTITIONED; @@ -52,6 +55,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryBackupQueueTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -130,6 +134,7 @@ public class IgniteCacheContinuousQueryBackupQueueTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testBackupQueue() throws Exception { final CacheEventListener lsnr = new CacheEventListener(); @@ -153,6 +158,7 @@ public class IgniteCacheContinuousQueryBackupQueueTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testManyQueryBackupQueue() throws Exception { List<QueryCursor> qryCursors = new ArrayList<>(); @@ -185,6 +191,7 @@ public class IgniteCacheContinuousQueryBackupQueueTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testBackupQueueAutoUnsubscribeFalse() throws Exception { try { client = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java index 906cc7d..f861396 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientReconnectTest.java @@ -30,6 +30,9 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteClientReconnectAbstractTest; import org.apache.ignite.resources.LoggerResource; +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; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientReconnectAbstractTest { /** {@inheritDoc} */ @Override protected int serverCount() { @@ -75,6 +79,7 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR /** * @throws Exception If failed. */ + @Test public void testReconnectClient() throws Exception { Ignite client = grid(serverCount()); @@ -118,6 +123,7 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR /** * @throws Exception If failed. */ + @Test public void testReconnectClientAndLeftRouter() throws Exception { if (!tcpDiscovery()) return; @@ -187,4 +193,4 @@ public class IgniteCacheContinuousQueryClientReconnectTest extends IgniteClientR } } } -} \ 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/query/continuous/IgniteCacheContinuousQueryClientTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java index ab0cb50..ba51638 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryClientTest.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 java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -46,6 +49,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -89,6 +93,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testNodeJoins() throws Exception { startGrids(2); @@ -142,6 +147,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testNodeJoinsRestartQuery() throws Exception { startGrids(2); @@ -199,6 +205,7 @@ public class IgniteCacheContinuousQueryClientTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testServerNodeLeft() throws Exception { startGrids(3); @@ -298,4 +305,4 @@ public class IgniteCacheContinuousQueryClientTest 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/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java index 4e50cb9..0dc62bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryImmutableEntryTest.java @@ -40,6 +40,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -48,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -96,6 +100,7 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst /** * @throws Exception If failed. */ + @Test public void testEventAvailabilityScope() throws Exception { startGrids(GRID_COUNT); @@ -135,6 +140,7 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst /** * */ + @Test public void testCacheContinuousQueryEntrySerialization() { CacheContinuousQueryEntry e0 = new CacheContinuousQueryEntry( 1, @@ -208,4 +214,4 @@ public class IgniteCacheContinuousQueryImmutableEntryTest extends GridCommonAbst // No-op } } -} \ 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/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java index d683346..0b6bd4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -78,6 +82,7 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNoUnsubscribe() throws Exception { checkNoUnsubscribe(false); } @@ -85,6 +90,7 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNoUnsubscribeClient() throws Exception { checkNoUnsubscribe(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java index b104a65..b0bb365 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryReconnectTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.cache.query.ContinuousQuery; 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; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -40,6 +43,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractTest implements Serializable { /** */ private static final AtomicInteger cnt = new AtomicInteger(); @@ -82,6 +86,7 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testReconnectServer() throws Exception { testReconnect(false); } @@ -89,6 +94,7 @@ public class IgniteCacheContinuousQueryReconnectTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testReconnectClient() throws Exception { testReconnect(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java index 7463fa7..25cf6ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractTest.java @@ -38,6 +38,10 @@ import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.jetbrains.annotations.Nullable; +import org.junit.Before; +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; @@ -46,6 +50,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Basic store test. */ +@RunWith(JUnit4.class) public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAbstractTest { /** Flush frequency. */ private static final int WRITE_FROM_BEHIND_FLUSH_FREQUENCY = 1000; @@ -54,6 +59,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb private static final GridCacheTestStore store = new GridCacheTestStore(); /** {@inheritDoc} */ + @Before @Override public void setUp() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); @@ -116,6 +122,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb } /** @throws Exception If test fails. */ + @Test public void testWriteThrough() throws Exception { IgniteCache<Integer, String> cache = jcache(); @@ -181,6 +188,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb } /** @throws Exception If test failed. */ + @Test public void testReadThrough() throws Exception { IgniteCache<Integer, String> cache = jcache(); @@ -273,6 +281,7 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb } /** @throws Exception If failed. */ + @Test public void testMultithreaded() throws Exception { final ConcurrentMap<String, Set<Integer>> perThread = new ConcurrentHashMap<>(); @@ -357,4 +366,4 @@ public abstract class GridCacheWriteBehindStoreAbstractTest extends GridCommonAb } } -} \ 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/store/GridCacheWriteBehindStoreLocalTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java index 160203e..8eaffe1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreLocalTest.java @@ -19,12 +19,14 @@ package org.apache.ignite.internal.processors.cache.store; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.testframework.MvccFeatureChecker; +import org.junit.Before; /** * Tests {@link org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore} in grid configuration. */ public class GridCacheWriteBehindStoreLocalTest extends GridCacheWriteBehindStoreAbstractTest { /** {@inheritDoc} */ + @Before @Override public void setUp() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.LOCAL_CACHE); @@ -35,4 +37,4 @@ public class GridCacheWriteBehindStoreLocalTest extends GridCacheWriteBehindStor @Override protected CacheMode cacheMode() { return CacheMode.LOCAL; } -} \ 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/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java index a9558aa..aa29f91 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreMultithreadedSelfTest.java @@ -23,16 +23,21 @@ import java.util.Map; import java.util.Set; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Multithreaded tests for {@link org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore}. */ +@RunWith(JUnit4.class) public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWriteBehindStoreAbstractSelfTest { /** * This test performs complex set of operations on store with coalescing from multiple threads. * * @throws Exception If failed. */ + @Test public void testPutGetRemoveWithCoalescing() throws Exception { testPutGetRemove(true); } @@ -42,6 +47,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri * * @throws Exception If failed. */ + @Test public void testPutGetRemoveWithoutCoalescing() throws Exception { testPutGetRemove(false); } @@ -86,6 +92,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri * * @throws Exception if failed. */ + @Test public void testStoreFailureWithCoalescing() throws Exception { testStoreFailure(true); } @@ -95,6 +102,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri * * @throws Exception if failed. */ + @Test public void testStoreFailureWithoutCoalescing() throws Exception { testStoreFailure(false); } @@ -162,6 +170,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri * * @throws Exception If failed. */ + @Test public void testFlushFromTheSameThreadWithCoalescing() throws Exception { testFlushFromTheSameThread(true); } @@ -172,6 +181,7 @@ public class GridCacheWriteBehindStoreMultithreadedSelfTest extends GridCacheWri * * @throws Exception If failed. */ + @Test public void testFlushFromTheSameThreadWithoutCoalescing() throws Exception { testFlushFromTheSameThread(false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java index d60dc4a..85711f7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java @@ -38,6 +38,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; @@ -46,6 +49,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * Tests write-behind store with near and dht commit option. */ +@RunWith(JUnit4.class) public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridCommonAbstractTest { /** Grids to start. */ private static final int GRID_CNT = 5; @@ -94,10 +98,8 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC } /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { + @Override protected void beforeTest() throws Exception { MvccFeatureChecker.failIfNotSupported(MvccFeatureChecker.Feature.CACHE_STORE); - - super.beforeTestsStarted(); } /** {@inheritDoc} */ @@ -122,6 +124,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC /** * @throws Exception If failed. */ + @Test public void testSingleWritesOnDhtNode() throws Exception { checkSingleWrites(); } @@ -129,6 +132,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC /** * @throws Exception If failed. */ + @Test public void testBatchWritesOnDhtNode() throws Exception { checkBatchWrites(); } @@ -136,6 +140,7 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC /** * @throws Exception If failed. */ + @Test public void testTxWritesOnDhtNode() throws Exception { checkTxWrites(); } @@ -221,4 +226,4 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC for (int i = 0; i < 100; i++) assertTrue(allKeys.contains(i)); } -} \ 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/store/GridCacheWriteBehindStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java index 33bbfdc..b242ac9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreSelfTest.java @@ -29,16 +29,21 @@ import org.apache.ignite.internal.processors.cache.GridCacheTestStore; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.jsr166.ConcurrentLinkedHashMap; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * This class provides basic tests for {@link org.apache.ignite.internal.processors.cache.store.GridCacheWriteBehindStore}. */ +@RunWith(JUnit4.class) public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStoreAbstractSelfTest { /** * Tests correct store (with write coalescing) shutdown when underlying store fails. * * @throws Exception If failed. */ + @Test public void testShutdownWithFailureWithCoalescing() throws Exception { testShutdownWithFailure(true); } @@ -48,6 +53,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testShutdownWithFailureWithoutCoalescing() throws Exception { testShutdownWithFailure(false); } @@ -93,6 +99,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testSimpleStoreWithCoalescing() throws Exception { testSimpleStore(true); } @@ -102,6 +109,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testSimpleStoreWithoutCoalescing() throws Exception { testSimpleStore(false); } @@ -112,6 +120,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testSimpleStoreFlushFrequencyWithoutCoalescing() throws Exception { initStore(1, false); @@ -177,6 +186,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testValuePropagationWithCoalescing() throws Exception { testValuePropagation(true); } @@ -187,6 +197,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testValuePropagationWithoutCoalescing() throws Exception { testValuePropagation(false); } @@ -233,6 +244,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testContinuousPutWithCoalescing() throws Exception { testContinuousPut(true); } @@ -242,6 +254,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testContinuousPutWithoutCoalescing() throws Exception { testContinuousPut(false); } @@ -318,6 +331,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testShutdownWithCoalescing() throws Exception { testShutdown(true); } @@ -328,6 +342,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testShutdownWithoutCoalescing() throws Exception { testShutdown(false); } @@ -387,6 +402,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testBatchApplyWithCoalescing() throws Exception { testBatchApply(true); } @@ -397,6 +413,7 @@ public class GridCacheWriteBehindStoreSelfTest extends GridCacheWriteBehindStore * * @throws Exception If failed. */ + @Test public void testBatchApplyWithoutCoalescing() throws Exception { testBatchApply(false); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java index ce26c2c..49acd92 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java @@ -39,10 +39,14 @@ import org.apache.ignite.cache.store.CacheStoreAdapter; 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; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheWriteBehindNoUpdateSelfTest extends GridCommonAbstractTest { /** */ private static final String THROTTLES_CACHE_NAME = "test"; @@ -83,6 +87,7 @@ public class IgniteCacheWriteBehindNoUpdateSelfTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testEntryProcessorNoUpdate() throws Exception { IgniteCache<Object, Object> cache = ignite(0).cache(THROTTLES_CACHE_NAME);
