http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java index 59e0691..db762a8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinActiveNodeToInActiveCluster.java @@ -18,10 +18,14 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster.join; import org.apache.ignite.internal.processors.cache.persistence.standbycluster.AbstractNodeJoinTemplate; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JoinActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate { /** {@inheritDoc} */ @Override public JoinNodeTestPlanBuilder withOutConfigurationTemplate() throws Exception { @@ -153,26 +157,31 @@ public class JoinActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate { // Server node join. /** {@inheritDoc} */ + @Test @Override public void testJoinWithOutConfiguration() throws Exception { withOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationOnJoin() throws Exception { staticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationInCluster() throws Exception { staticCacheConfigurationInClusterTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationSameOnBoth() throws Exception { staticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationDifferentOnBoth() throws Exception { staticCacheConfigurationDifferentOnBothTemplate().execute(); } @@ -180,16 +189,19 @@ public class JoinActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate { // Client node join. /** {@inheritDoc} */ + @Test @Override public void testJoinClientWithOutConfiguration() throws Exception { joinClientWithOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationOnJoin() throws Exception { joinClientStaticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationInCluster() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5518";); @@ -197,11 +209,13 @@ public class JoinActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate { } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationSameOnBoth() throws Exception { joinClientStaticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationDifferentOnBoth() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5518";);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java index d9b0dd4..2ed470f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToActiveCluster.java @@ -24,10 +24,14 @@ import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.util.typedef.internal.CU; import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JoinInActiveNodeToActiveCluster extends AbstractNodeJoinTemplate { /** {@inheritDoc} */ @Override public JoinNodeTestPlanBuilder withOutConfigurationTemplate() throws Exception { @@ -192,26 +196,31 @@ public class JoinInActiveNodeToActiveCluster extends AbstractNodeJoinTemplate { // Server node join. /** {@inheritDoc} */ + @Test @Override public void testJoinWithOutConfiguration() throws Exception { withOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationOnJoin() throws Exception { staticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationInCluster() throws Exception { staticCacheConfigurationInClusterTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationSameOnBoth() throws Exception { staticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationDifferentOnBoth() throws Exception { staticCacheConfigurationDifferentOnBothTemplate().execute(); } @@ -219,26 +228,31 @@ public class JoinInActiveNodeToActiveCluster extends AbstractNodeJoinTemplate { // Client node join. /** {@inheritDoc} */ + @Test @Override public void testJoinClientWithOutConfiguration() throws Exception { joinClientWithOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationOnJoin() throws Exception { joinClientStaticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationInCluster() throws Exception { joinClientStaticCacheConfigurationInClusterTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationSameOnBoth() throws Exception { joinClientStaticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationDifferentOnBoth() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5518";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java index dabd0a3..d77564d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/JoinInActiveNodeToInActiveCluster.java @@ -18,10 +18,14 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster.join; import org.apache.ignite.internal.processors.cache.persistence.standbycluster.AbstractNodeJoinTemplate; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JoinInActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate { /** {@inheritDoc} */ @Override public JoinNodeTestPlanBuilder withOutConfigurationTemplate() throws Exception { @@ -153,26 +157,31 @@ public class JoinInActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate // Server node join. /** {@inheritDoc} */ + @Test @Override public void testJoinWithOutConfiguration() throws Exception { withOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationOnJoin() throws Exception { staticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationInCluster() throws Exception { staticCacheConfigurationInClusterTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationSameOnBoth() throws Exception { staticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testStaticCacheConfigurationDifferentOnBoth() throws Exception { staticCacheConfigurationDifferentOnBothTemplate().execute(); } @@ -180,16 +189,19 @@ public class JoinInActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate // Client node join. /** {@inheritDoc} */ + @Test @Override public void testJoinClientWithOutConfiguration() throws Exception { joinClientWithOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationOnJoin() throws Exception { joinClientStaticCacheConfigurationOnJoinTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationInCluster() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5518";); @@ -197,11 +209,13 @@ public class JoinInActiveNodeToInActiveCluster extends AbstractNodeJoinTemplate } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationSameOnBoth() throws Exception { joinClientStaticCacheConfigurationSameOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationDifferentOnBoth() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-5518";); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinActiveNodeToActiveClusterWithPersistence.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinActiveNodeToActiveClusterWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinActiveNodeToActiveClusterWithPersistence.java index 1ccfb7d..cd65580 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinActiveNodeToActiveClusterWithPersistence.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/join/persistence/JoinActiveNodeToActiveClusterWithPersistence.java @@ -20,10 +20,14 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster.j import org.apache.ignite.internal.processors.cache.persistence.standbycluster.join.JoinActiveNodeToActiveCluster; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.cache.persistence.standbycluster.AbstractNodeJoinTemplate; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class JoinActiveNodeToActiveClusterWithPersistence extends JoinActiveNodeToActiveCluster { /** {@inheritDoc} */ @Override protected IgniteConfiguration cfg(String name) throws Exception { @@ -67,21 +71,25 @@ public class JoinActiveNodeToActiveClusterWithPersistence extends JoinActiveNode } /** {@inheritDoc} */ + @Test @Override public void testJoinWithOutConfiguration() throws Exception { withOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientWithOutConfiguration() throws Exception { joinClientWithOutConfigurationTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationDifferentOnBoth() throws Exception { staticCacheConfigurationDifferentOnBothTemplate().execute(); } /** {@inheritDoc} */ + @Test @Override public void testJoinClientStaticCacheConfigurationInCluster() throws Exception { staticCacheConfigurationInClusterTemplate().execute(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectTest.java index d2244d4..28bcbb1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectTest.java @@ -19,14 +19,19 @@ package org.apache.ignite.internal.processors.cache.persistence.standbycluster.r import java.util.concurrent.CountDownLatch; import org.apache.ignite.internal.IgniteEx; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class IgniteStandByClientReconnectTest extends IgniteAbstractStandByClientReconnectTest { /** * @throws Exception If failed. */ + @Test public void testActiveClientReconnectToActiveCluster() throws Exception { CountDownLatch activateLatch = new CountDownLatch(1); @@ -108,6 +113,7 @@ public class IgniteStandByClientReconnectTest extends IgniteAbstractStandByClien /** * @throws Exception If failed. */ + @Test public void testActiveClientReconnectToInActiveCluster() throws Exception { CountDownLatch activateLatch = new CountDownLatch(1); @@ -188,6 +194,7 @@ public class IgniteStandByClientReconnectTest extends IgniteAbstractStandByClien /** * @throws Exception If failed. */ + @Test public void testInActiveClientReconnectToActiveCluster() throws Exception { CountDownLatch activateLatch = new CountDownLatch(1); @@ -245,6 +252,7 @@ public class IgniteStandByClientReconnectTest extends IgniteAbstractStandByClien /** * @throws Exception If failed. */ + @Test public void testInActiveClientReconnectToInActiveCluster() throws Exception { startNodes(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectToNewClusterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectToNewClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectToNewClusterTest.java index c1f672b..a9abff1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectToNewClusterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteStandByClientReconnectToNewClusterTest.java @@ -22,14 +22,19 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.CountDownLatch; import org.apache.ignite.internal.IgniteEx; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class IgniteStandByClientReconnectToNewClusterTest extends IgniteAbstractStandByClientReconnectTest { /** * @throws Exception If failed. */ + @Test public void testActiveClientReconnectsToActiveCluster() throws Exception { CountDownLatch activateLatch = new CountDownLatch(1); @@ -109,6 +114,7 @@ public class IgniteStandByClientReconnectToNewClusterTest extends IgniteAbstract /** * @throws Exception If failed. */ + @Test public void testActiveClientReconnectsToInactiveCluster() throws Exception { startNodes(null); @@ -189,6 +195,7 @@ public class IgniteStandByClientReconnectToNewClusterTest extends IgniteAbstract /** * @throws Exception If failed. */ + @Test public void testInactiveClientReconnectsToActiveCluster() throws Exception { CountDownLatch activateLatch = new CountDownLatch(1); @@ -250,6 +257,7 @@ public class IgniteStandByClientReconnectToNewClusterTest extends IgniteAbstract /** * @throws Exception If failed. */ + @Test public void testInactiveClientReconnectsToInactiveCluster() throws Exception { startNodes(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java index cacea48..c4fb28d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/TrackingPageIOTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.processors.cache.persistence.snapshot.TrackingPageIsCorruptedException; import org.apache.ignite.internal.util.GridUnsafe; import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class TrackingPageIOTest extends TestCase { /** Page size. */ public static final int PAGE_SIZE = 4096; @@ -46,6 +50,7 @@ public class TrackingPageIOTest extends TestCase { /** * */ + @Test public void testBasics() throws Exception { ByteBuffer buf = createBuffer(); @@ -72,6 +77,7 @@ public class TrackingPageIOTest extends TestCase { /** * */ + @Test public void testMarkingRandomly() throws Exception { ByteBuffer buf = createBuffer(); @@ -82,6 +88,7 @@ public class TrackingPageIOTest extends TestCase { /** * */ + @Test public void testZeroingRandomly() throws Exception { ByteBuffer buf = createBuffer(); @@ -142,6 +149,7 @@ public class TrackingPageIOTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testFindNextChangedPage() throws Exception { ByteBuffer buf = createBuffer(); @@ -197,6 +205,7 @@ public class TrackingPageIOTest extends TestCase { /** * */ + @Test public void testMerging() throws Exception { ByteBuffer buf = createBuffer(); @@ -235,6 +244,7 @@ public class TrackingPageIOTest extends TestCase { /** * */ + @Test public void testMerging_MarksShouldBeDropForSuccessfulBackup() throws Exception { ByteBuffer buf = createBuffer(); @@ -303,6 +313,7 @@ public class TrackingPageIOTest extends TestCase { * * @throws Exception if failed. */ + @Test public void testThatWeDontFailIfSnapshotTagWasLost() throws Exception { ByteBuffer buf = createBuffer(); @@ -356,4 +367,4 @@ public class TrackingPageIOTest extends TestCase { assertFalse(io.wasChanged(buf, id, oldTag, oldTag - 1, PAGE_SIZE)); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBufferTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBufferTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBufferTest.java index 87f3fa7..032a357 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBufferTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/SegmentedRingByteBufferTest.java @@ -39,6 +39,9 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.cache.persistence.wal.SegmentedRingByteBuffer.BufferMode.DIRECT; import static org.apache.ignite.internal.processors.cache.persistence.wal.SegmentedRingByteBuffer.BufferMode.ONHEAP; @@ -46,10 +49,12 @@ import static org.apache.ignite.internal.processors.cache.persistence.wal.Segmen /** * */ +@RunWith(JUnit4.class) public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAligned() throws Exception { doTestAligned(ONHEAP); } @@ -57,6 +62,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAlignedDirect() throws Exception { doTestAligned(DIRECT); } @@ -64,6 +70,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNotAligned() throws Exception { doTestNotAligned(ONHEAP); } @@ -71,6 +78,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNotAlignedDirect() throws Exception { doTestNotAligned(DIRECT); } @@ -78,6 +86,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoOverflowMultiThreaded() throws Exception { doTestNoOverflowMultiThreaded(ONHEAP); } @@ -85,6 +94,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNoOverflowMultiThreadedDirect() throws Exception { doTestNoOverflowMultiThreaded(DIRECT); } @@ -92,6 +102,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMultiThreaded() throws Exception { doTestMultiThreaded(ONHEAP); } @@ -99,6 +110,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMultiThreadedDirect() throws Exception { doTestMultiThreaded(DIRECT); } @@ -106,6 +118,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMultiThreaded2() throws Exception { doTestMultiThreaded2(ONHEAP); } @@ -113,6 +126,7 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMultiThreadedDirect2() throws Exception { doTestMultiThreaded2(DIRECT); } @@ -782,4 +796,4 @@ public class SegmentedRingByteBufferTest extends GridCommonAbstractTest { return res; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/aware/SegmentAwareTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/aware/SegmentAwareTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/aware/SegmentAwareTest.java index d651e01..381cf40 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/aware/SegmentAwareTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/aware/SegmentAwareTest.java @@ -23,6 +23,9 @@ import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -30,6 +33,7 @@ import static org.junit.Assert.assertThat; /** * Test for {@link SegmentAware}. */ +@RunWith(JUnit4.class) public class SegmentAwareTest extends TestCase { /** @@ -38,6 +42,7 @@ public class SegmentAwareTest extends TestCase { * * @throws IgniteCheckedException if failed. */ + @Test public void testAvoidDeadlockArchiverAndLockStorage() throws IgniteCheckedException { SegmentAware aware = new SegmentAware(10, false); @@ -74,6 +79,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when work segment is set. */ + @Test public void testFinishAwaitSegment_WhenExactWaitingSegmentWasSet() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -90,6 +96,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when work segment greater than expected is set. */ + @Test public void testFinishAwaitSegment_WhenGreaterThanWaitingSegmentWasSet() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -106,6 +113,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when work segment is set. */ + @Test public void testFinishAwaitSegment_WhenNextSegmentEqualToWaitingOne() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -128,6 +136,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when interrupt was triggered. */ + @Test public void testFinishAwaitSegment_WhenInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -144,6 +153,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when next work segment triggered. */ + @Test public void testFinishWaitSegmentForArchive_WhenWorkSegmentIncremented() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -163,6 +173,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when work segment is set. */ + @Test public void testFinishWaitSegmentForArchive_WhenWorkSegmentGreaterValue() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -182,6 +193,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when interrupt was triggered. */ + @Test public void testFinishWaitSegmentForArchive_WhenInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -201,6 +213,7 @@ public class SegmentAwareTest extends TestCase { /** * Should correct calculate next segment. */ + @Test public void testCorrectCalculateNextSegmentIndex() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -217,6 +230,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishWaitNextAbsoluteIndex_WhenMarkAsArchivedFirstSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(2, false); @@ -236,6 +250,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishWaitNextAbsoluteIndex_WhenSetToArchivedFirst() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(2, false); @@ -255,6 +270,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when force interrupt was triggered. */ + @Test public void testFinishWaitNextAbsoluteIndex_WhenOnlyForceInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(2, false); @@ -280,6 +296,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishSegmentArchived_WhenSetExactWaitingSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -296,6 +313,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishSegmentArchived_WhenMarkExactWaitingSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -312,6 +330,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishSegmentArchived_WhenSetGreaterThanWaitingSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -328,6 +347,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishSegmentArchived_WhenMarkGreaterThanWaitingSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -344,6 +364,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when interrupt was triggered. */ + @Test public void testFinishSegmentArchived_WhenInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -363,6 +384,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when release work segment. */ + @Test public void testMarkAsMovedToArchive_WhenReleaseLockedSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -381,6 +403,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished and increment archived segment when interrupt was call. */ + @Test public void testMarkAsMovedToArchive_WhenInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -401,6 +424,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishWaitSegmentToCompress_WhenSetLastArchivedSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, true); @@ -419,6 +443,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when segment archived. */ + @Test public void testFinishWaitSegmentToCompress_WhenMarkLastArchivedSegment() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, true); @@ -437,6 +462,7 @@ public class SegmentAwareTest extends TestCase { /** * Next segment for compress based on truncated archive idx. */ + @Test public void testCorrectCalculateNextCompressSegment() throws IgniteCheckedException, InterruptedException { SegmentAware aware = new SegmentAware(10, true); @@ -449,6 +475,7 @@ public class SegmentAwareTest extends TestCase { /** * Waiting finished when interrupt was call. */ + @Test public void testFinishWaitSegmentToCompress_WhenInterruptWasCall() throws IgniteCheckedException, InterruptedException { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, true); @@ -466,6 +493,7 @@ public class SegmentAwareTest extends TestCase { /** * Tests that {@link SegmentAware#onSegmentCompressed} returns segments in proper order. */ + @Test public void testLastCompressedIdxProperOrdering() throws IgniteInterruptedCheckedException { SegmentAware aware = new SegmentAware(10, true); @@ -489,6 +517,7 @@ public class SegmentAwareTest extends TestCase { /** * Segment reserve correctly. */ + @Test public void testReserveCorrectly() { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -532,6 +561,7 @@ public class SegmentAwareTest extends TestCase { /** * Should fail when release unreserved segment. */ + @Test public void testAssertFail_WhenReleaseUnreservedSegment() { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -551,6 +581,7 @@ public class SegmentAwareTest extends TestCase { /** * Segment locked correctly. */ + @Test public void testReserveWorkSegmentCorrectly() { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -584,6 +615,7 @@ public class SegmentAwareTest extends TestCase { /** * Should fail when release unlocked segment. */ + @Test public void testAssertFail_WhenReleaseUnreservedWorkSegment() { //given: thread which awaited segment. SegmentAware aware = new SegmentAware(10, false); @@ -654,4 +686,4 @@ public class SegmentAwareTest extends TestCase { */ void await() throws IgniteInterruptedCheckedException; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIteratorTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIteratorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIteratorTest.java index b77b72a..1f06b7d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIteratorTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIteratorTest.java @@ -49,12 +49,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.cache.persistence.wal.reader.IgniteWalIteratorFactory.IteratorParametersBuilder; /** * The test check, that StandaloneWalRecordsIterator correctly close file descriptors associated with WAL files. */ +@RunWith(JUnit4.class) public class StandaloneWalRecordsIteratorTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -131,6 +135,7 @@ public class StandaloneWalRecordsIteratorTest extends GridCommonAbstractTest { * * @throws Exception if test failed. */ + @Test public void testCorrectClosingFileDescriptors() throws Exception { // Iterate by all archived WAL segments. @@ -147,6 +152,7 @@ public class StandaloneWalRecordsIteratorTest extends GridCommonAbstractTest { * * @throws Exception if test failed. */ + @Test public void testStrictBounds() throws Exception { String dir = createWalFiles(); @@ -315,4 +321,4 @@ public class StandaloneWalRecordsIteratorTest extends GridCommonAbstractTest { */ public static int getCountClosedWalFiles() { return WAL_CLOSE_COUNTER.get(); } } -} \ 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/CacheScanQueryFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java index 0633138..f5f13e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteClosure; 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.LOCAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * ScanQuery failover test. Tests scenario where user supplied closures throw unhandled errors. */ +@RunWith(JUnit4.class) public class CacheScanQueryFailoverTest extends GridCommonAbstractTest { /** */ private static final String LOCAL_CACHE_NAME = "local"; @@ -85,6 +89,7 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryWithFailedClosures() throws Exception { Ignite srv = startGrids(4); Ignite client = startGrid("client"); @@ -103,6 +108,7 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQueryOverLocalCacheWithFailedClosures() throws Exception { Ignite srv = startGrids(4); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java index 53acd22..2626b33 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java @@ -45,10 +45,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; /** * Test for scan query with transformer. */ +@RunWith(JUnit4.class) public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -80,6 +84,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetKeys() throws Exception { IgniteCache<Integer, String> cache = grid().createCache("test-cache"); @@ -111,6 +116,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetKeysFiltered() throws Exception { IgniteCache<Integer, String> cache = grid().createCache("test-cache"); @@ -148,6 +154,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetObjectField() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -179,6 +186,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetObjectFieldPartitioned() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -219,6 +227,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testGetObjectFieldFiltered() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -256,6 +265,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testKeepBinary() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -289,6 +299,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testKeepBinaryFiltered() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -328,6 +339,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLocal() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -369,6 +381,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLocalFiltered() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -416,6 +429,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLocalKeepBinary() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -457,6 +471,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLocalKeepBinaryFiltered() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -504,6 +519,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testUnsupported() throws Exception { final IgniteCache<Integer, Integer> cache = grid().createCache("test-cache"); @@ -592,6 +608,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageSize() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); @@ -629,6 +646,7 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testLocalInjection() throws Exception { IgniteCache<Integer, Value> cache = grid().createCache("test-cache"); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCircularQueueTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCircularQueueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCircularQueueTest.java index a07bd64..e7449be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCircularQueueTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCircularQueueTest.java @@ -20,13 +20,18 @@ package org.apache.ignite.internal.processors.cache.query; import java.util.ArrayDeque; import org.apache.ignite.internal.util.GridRandom; 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 GridCircularQueueTest extends GridCommonAbstractTest { /** * */ + @Test public void testQueue() { GridCacheQueryManager.CircularQueue<Integer> q = new GridCacheQueryManager.CircularQueue<>(4); @@ -115,4 +120,4 @@ public class GridCircularQueueTest extends GridCommonAbstractTest { for (Object o : d) assertEquals(q.get(i++), o); } -} \ 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/IgniteCacheQueryCacheDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java index d0d392b..d97ad29 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IgniteCacheQueryCacheDestroySelfTest.java @@ -37,10 +37,14 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; 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; /** * The test for the destruction of the cache during the execution of the query */ +@RunWith(JUnit4.class) public class IgniteCacheQueryCacheDestroySelfTest extends GridCommonAbstractTest { /** */ private static final String CACHE_NAME = "cache"; @@ -55,6 +59,7 @@ public class IgniteCacheQueryCacheDestroySelfTest extends GridCommonAbstractTest /** * The main test code. */ + @Test public void testQueue() throws Throwable { startGridsMultiThreaded(GRID_CNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java index bd76616..31e2253 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java @@ -52,10 +52,14 @@ import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionState; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Indexing Spi query only test */ +@RunWith(JUnit4.class) public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { private IndexingSpi indexingSpi; @@ -89,6 +93,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testSimpleIndexingSpi() throws Exception { indexingSpi = new MyIndexingSpi(); @@ -110,6 +115,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIndexingSpiWithDisabledQueryProcessor() throws Exception { indexingSpi = new MyIndexingSpi(); @@ -131,6 +137,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBinaryIndexingSpi() throws Exception { indexingSpi = new MyBinaryIndexingSpi(); @@ -159,6 +166,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testNonBinaryIndexingSpi() throws Exception { System.setProperty(IgniteSystemProperties.IGNITE_UNWRAP_BINARY_FOR_INDEXING_SPI, "true"); @@ -193,6 +201,7 @@ public class IndexingSpiQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testIndexingSpiFailure() throws Exception { indexingSpi = new MyBrokenIndexingSpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQueryTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQueryTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQueryTxSelfTest.java index d3f6896..2c36989 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQueryTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQueryTxSelfTest.java @@ -40,10 +40,14 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionState; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Indexing Spi transactional query test */ +@RunWith(JUnit4.class) public class IndexingSpiQueryTxSelfTest extends GridCacheAbstractSelfTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -71,6 +75,7 @@ public class IndexingSpiQueryTxSelfTest extends GridCacheAbstractSelfTest { } /** */ + @Test public void testIndexingSpiWithTxClient() throws Exception { IgniteEx client = startGrid("client"); @@ -80,6 +85,7 @@ public class IndexingSpiQueryTxSelfTest extends GridCacheAbstractSelfTest { } /** */ + @Test public void testIndexingSpiWithTxLocal() throws Exception { IgniteEx ignite = (IgniteEx)primaryNode(0, DEFAULT_CACHE_NAME); @@ -87,6 +93,7 @@ public class IndexingSpiQueryTxSelfTest extends GridCacheAbstractSelfTest { } /** */ + @Test public void testIndexingSpiWithTxNotLocal() throws Exception { IgniteEx ignite = (IgniteEx)primaryNode(0, 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/query/ScanQueryOffheapExpiryPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java index a3b1d41..83d8296 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java @@ -29,6 +29,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import javax.cache.expiry.CreatedExpiryPolicy; import javax.cache.expiry.Duration; import java.util.concurrent.TimeUnit; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CachePeekMode.OFFHEAP; import static org.apache.ignite.cache.CachePeekMode.ONHEAP; @@ -36,6 +39,7 @@ import static org.apache.ignite.cache.CachePeekMode.ONHEAP; /** * */ +@RunWith(JUnit4.class) public class ScanQueryOffheapExpiryPolicySelfTest extends GridCommonAbstractTest { /** Nodes count. */ @@ -74,6 +78,7 @@ public class ScanQueryOffheapExpiryPolicySelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testEntriesMovedFromOnHeap() throws Exception { Ignite ignite0 = grid(0); Ignite ignite1 = grid(1); http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java index 400ae28..779b160 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java @@ -41,6 +41,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -53,6 +56,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IGNITE_INSTAN /** * Continuous queries tests. */ +@RunWith(JUnit4.class) public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implements Serializable { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -118,6 +122,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartition() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, ATOMIC, false)); } @@ -125,6 +130,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionWithFilter() throws Exception { filterOn.set(true); @@ -134,6 +140,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionNoBackups() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, ATOMIC, false)); } @@ -141,6 +148,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionTx() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL, false)); } @@ -148,6 +156,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionTxWithFilter() throws Exception { filterOn.set(true); @@ -157,6 +166,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionTxNoBackup() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL, false)); } @@ -164,6 +174,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionTxNoBackupWithFilter() throws Exception { filterOn.set(true); @@ -173,6 +184,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testReplicated() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, ATOMIC, false)); } @@ -180,6 +192,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testReplicatedTx() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL, false)); } @@ -187,6 +200,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testReplicatedTxWithFilter() throws Exception { filterOn.set(true); @@ -198,6 +212,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionMvccTx() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 1, TRANSACTIONAL_SNAPSHOT, false)); } @@ -205,6 +220,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionMvccTxWithFilter() throws Exception { filterOn.set(true); @@ -214,6 +230,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionMvccTxNoBackup() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(PARTITIONED, 0, TRANSACTIONAL_SNAPSHOT, false)); } @@ -221,6 +238,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testPartitionMvccTxNoBackupWithFilter() throws Exception { filterOn.set(true); @@ -230,6 +248,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testReplicatedMvccTx() throws Exception { checkBackupAcknowledgeMessage(cacheConfiguration(REPLICATED, 1, TRANSACTIONAL_SNAPSHOT, false)); } @@ -237,6 +256,7 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen /** * @throws Exception If failed. */ + @Test public void testReplicatedMvccTxWithFilter() throws Exception { filterOn.set(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/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java index aa60aeb..f342d4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverMvccTxSelfTest.java @@ -18,6 +18,9 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -25,6 +28,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class CacheContinuousQueryAsyncFailoverMvccTxSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest { /** {@inheritDoc} */ @Override protected CacheMode cacheMode() { @@ -42,11 +46,13 @@ public class CacheContinuousQueryAsyncFailoverMvccTxSelfTest extends CacheConti } /** {@inheritDoc} */ + @Test @Override public void testBackupQueueEvict() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-7311";); } /** {@inheritDoc} */ + @Test @Override public void testFailoverStartStopBackup() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-10391";); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f0544d46/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java index 328b023..393652c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java @@ -53,6 +53,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -67,6 +70,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstractTest { /** */ private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -114,6 +118,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerTx() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } @@ -121,6 +126,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerTxJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, true); } @@ -128,6 +134,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerMvccTx() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -135,6 +142,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerMvccTxJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, true); } @@ -142,6 +150,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerAtomic() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, false); } @@ -149,6 +158,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerAtomicJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, true); } @@ -156,6 +166,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedAtomic() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } @@ -163,6 +174,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedAtomicJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, true); } @@ -170,6 +182,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedAtomicOffHeapValues() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } @@ -177,6 +190,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerAtomicWithoutBackup() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, false); } @@ -184,6 +198,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerAtomicWithoutBackupJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, true); } @@ -191,6 +206,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListener() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } @@ -198,6 +214,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicated() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } @@ -205,6 +222,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedJCacheApi() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, true); } @@ -212,6 +230,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerMvcc() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -219,6 +238,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedMvcc() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -226,6 +246,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInListenerReplicatedJCacheApiMvcc() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL_SNAPSHOT), true, true, true); } @@ -237,6 +258,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterTx() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } @@ -244,6 +266,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterTxJCacheApi() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, true); } @@ -251,6 +274,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterMvccTx() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -258,6 +282,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterMvccTxJCacheApi() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, true); } @@ -265,6 +290,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterAtomic() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, false); } @@ -272,6 +298,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterAtomicJCacheApi() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, ATOMIC), true, true, true); } @@ -279,6 +306,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedAtomic() throws Exception { testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, ATOMIC), true, true, false); } @@ -286,6 +314,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterAtomicWithoutBackup() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 0, ATOMIC), true, true, false); } @@ -293,6 +322,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilter() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), true, true, false); } @@ -300,6 +330,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicated() throws Exception { testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } @@ -307,6 +338,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedJCacheApi() throws Exception { testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), true, true, false); } @@ -314,6 +346,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterMvcc() throws Exception { testNonDeadLockInFilter(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -321,6 +354,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedMvcc() throws Exception { testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -328,6 +362,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedJCacheApiMvcc() throws Exception { testNonDeadLockInFilter(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL_SNAPSHOT), true, true, false); } @@ -339,6 +374,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterTxSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), false, true, false); } @@ -346,6 +382,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterMvccTxSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), false, true, false); } @@ -353,6 +390,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterAtomicSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, ATOMIC), false, true, false); } @@ -360,6 +398,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedAtomicSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, ATOMIC), false, true, false); } @@ -367,6 +406,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterAtomicWithoutBackupSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 0, ATOMIC), false, true, false); } @@ -374,6 +414,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL), false, true, false); } @@ -381,6 +422,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedSyncFilter() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL), false, true, false); } @@ -388,6 +430,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterSyncFilterMvcc() throws Exception { testNonDeadLockInListener(cacheConfiguration(PARTITIONED, 2, TRANSACTIONAL_SNAPSHOT), false, true, false); } @@ -395,6 +438,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Test public void testNonDeadLockInFilterReplicatedSyncFilterMvcc() throws Exception { testNonDeadLockInListener(cacheConfiguration(REPLICATED, 2, TRANSACTIONAL_SNAPSHOT), false, true, 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/CacheContinuousQueryConcurrentPartitionUpdateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java index 53a1715..fdb2180 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java @@ -45,6 +45,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -56,6 +59,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA /** * */ +@RunWith(JUnit4.class) public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -84,6 +88,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionAtomic() throws Exception { concurrentUpdatePartition(ATOMIC, false); } @@ -91,6 +96,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionTx() throws Exception { concurrentUpdatePartition(TRANSACTIONAL, false); } @@ -98,6 +104,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionMvccTx() throws Exception { concurrentUpdatePartition(TRANSACTIONAL_SNAPSHOT, false); } @@ -105,6 +112,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionAtomicCacheGroup() throws Exception { concurrentUpdatePartition(ATOMIC, true); } @@ -112,6 +120,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionTxCacheGroup() throws Exception { concurrentUpdatePartition(TRANSACTIONAL, true); } @@ -119,6 +128,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatePartitionMvccTxCacheGroup() throws Exception { concurrentUpdatePartition(TRANSACTIONAL_SNAPSHOT, true); } @@ -274,6 +284,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartAtomic() throws Exception { concurrentUpdatesAndQueryStart(ATOMIC, false); } @@ -281,6 +292,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartTx() throws Exception { concurrentUpdatesAndQueryStart(TRANSACTIONAL, false); } @@ -288,6 +300,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartMvccTx() throws Exception { concurrentUpdatesAndQueryStart(TRANSACTIONAL_SNAPSHOT, false); } @@ -295,6 +308,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartAtomicCacheGroup() throws Exception { concurrentUpdatesAndQueryStart(ATOMIC, true); } @@ -302,6 +316,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartTxCacheGroup() throws Exception { concurrentUpdatesAndQueryStart(TRANSACTIONAL, true); } @@ -309,6 +324,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo /** * @throws Exception If failed. */ + @Test public void testConcurrentUpdatesAndQueryStartMvccTxCacheGroup() throws Exception { concurrentUpdatesAndQueryStart(TRANSACTIONAL_SNAPSHOT, true); }
