http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTimeoutProcessorSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTimeoutProcessorSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTimeoutProcessorSelfTestSuite.java index c21175e..50bdbdc 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTimeoutProcessorSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTimeoutProcessorSelfTestSuite.java @@ -21,16 +21,18 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessorSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Suite for {@link GridTimeoutProcessor} tests. */ -public class IgniteTimeoutProcessorSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteTimeoutProcessorSelfTestSuite { /** * @return Job metrics test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Timeout Processor Test Suite"); suite.addTest(new JUnit4TestAdapter(GridTimeoutProcessorSelfTest.class));
http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java index 90106c5..1466b85 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteTopologyValidatorTestSuite.java @@ -33,11 +33,14 @@ import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorReplic import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorReplicatedTxCacheGroupsTest; import org.apache.ignite.internal.processors.cache.IgniteTopologyValidatorReplicatedTxCacheTest; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Topology validator test suite. */ -public class IgniteTopologyValidatorTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteTopologyValidatorTestSuite { /** * @param ignoredTests Ignored tests. * @return Topology validator tests suite. http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java index 6951065..34e3d4a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java @@ -63,11 +63,14 @@ import org.apache.ignite.util.mbeans.GridMBeanDisableSelfTest; import org.apache.ignite.util.mbeans.GridMBeanExoticNamesSelfTest; import org.apache.ignite.util.mbeans.GridMBeanSelfTest; import org.apache.ignite.util.mbeans.WorkersControlMXBeanTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Test suite for Ignite utility classes. */ -public class IgniteUtilSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteUtilSelfTestSuite { /** * @return Grid utility methods tests suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/InterceptorCacheConfigVariationsFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/InterceptorCacheConfigVariationsFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/InterceptorCacheConfigVariationsFullApiTestSuite.java index 31fd365..f25225c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/InterceptorCacheConfigVariationsFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/InterceptorCacheConfigVariationsFullApiTestSuite.java @@ -20,16 +20,18 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.InterceptorCacheConfigVariationsFullApiTest; import org.apache.ignite.testframework.configvariations.ConfigVariationsTestSuiteBuilder; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Test suite for cache API. */ -public class InterceptorCacheConfigVariationsFullApiTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class InterceptorCacheConfigVariationsFullApiTestSuite { /** * @return Cache API test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { return new ConfigVariationsTestSuiteBuilder( "Cache New Full API Test Suite with Interceptor", InterceptorCacheConfigVariationsFullApiTest.class) http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java index b0526c0..68695af 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/TxDeadlockDetectionTestSuite.java @@ -28,11 +28,14 @@ import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticDead import org.apache.ignite.internal.processors.cache.transactions.TxOptimisticDeadlockDetectionTest; import org.apache.ignite.internal.processors.cache.transactions.TxPessimisticDeadlockDetectionCrossCacheTest; import org.apache.ignite.internal.processors.cache.transactions.TxPessimisticDeadlockDetectionTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Deadlock detection related tests. */ -public class TxDeadlockDetectionTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class TxDeadlockDetectionTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/testsuites/WithKeepBinaryCacheConfigVariationsFullApiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/WithKeepBinaryCacheConfigVariationsFullApiTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/WithKeepBinaryCacheConfigVariationsFullApiTestSuite.java index e557d77..069274c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/WithKeepBinaryCacheConfigVariationsFullApiTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/WithKeepBinaryCacheConfigVariationsFullApiTestSuite.java @@ -23,17 +23,19 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.internal.processors.cache.WithKeepBinaryCacheFullApiTest; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.configvariations.ConfigVariationsTestSuiteBuilder; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Test suite for cache API. */ -public class WithKeepBinaryCacheConfigVariationsFullApiTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class WithKeepBinaryCacheConfigVariationsFullApiTestSuite { /** * @return Cache API test suite. - * @throws Exception If failed. */ @SuppressWarnings("serial") - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("With Keep Binary Cache Config Variations Full API Test Suite"); suite.addTest(new ConfigVariationsTestSuiteBuilder( http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java index 318b837..b9610ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java @@ -1102,6 +1102,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCacheIdleVerifyDumpWhenNodeFailing() throws Exception { Ignite ignite = startGrids(3); @@ -1138,6 +1139,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCacheIdleVerifyDumpWhenSeveralNodesFailing() throws Exception { int nodes = 6; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/util/GridIntListSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridIntListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridIntListSelfTest.java index e0d079c..16daa9a 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridIntListSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridIntListSelfTest.java @@ -17,19 +17,18 @@ package org.apache.ignite.util; -import junit.framework.TestCase; import org.apache.ignite.internal.util.GridIntList; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import static org.apache.ignite.internal.util.GridIntList.asList; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * */ -@RunWith(JUnit4.class) -public class GridIntListSelfTest extends TestCase { +public class GridIntListSelfTest { /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java index 61c27b2..bf69de7 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridLongListSelfTest.java @@ -17,19 +17,19 @@ package org.apache.ignite.util; -import junit.framework.TestCase; import org.apache.ignite.internal.util.GridLongList; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import static org.apache.ignite.internal.util.GridLongList.asList; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * */ -@RunWith(JUnit4.class) -public class GridLongListSelfTest extends TestCase { +public class GridLongListSelfTest { /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java index 466500d..ce04839 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridMessageCollectionTest.java @@ -18,7 +18,6 @@ package org.apache.ignite.util; import java.nio.ByteBuffer; -import junit.framework.TestCase; import org.apache.ignite.internal.direct.DirectMessageReader; import org.apache.ignite.internal.direct.DirectMessageWriter; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; @@ -28,17 +27,16 @@ import org.apache.ignite.plugin.extensions.communication.MessageFactory; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; import static java.util.UUID.randomUUID; import static org.apache.ignite.internal.util.GridMessageCollection.of; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; /** * */ -@RunWith(JUnit4.class) -public class GridMessageCollectionTest extends TestCase { +public class GridMessageCollectionTest { /** */ private byte proto; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java index 55e06d5..6758fda 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java @@ -27,8 +27,6 @@ import org.apache.ignite.internal.util.IgniteUtils; 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.After; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -39,7 +37,6 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class GridMBeanDisableSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ - @Before @Override public void setUp() throws Exception { IgniteUtils.IGNITE_MBEANS_DISABLED = true; @@ -47,7 +44,6 @@ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @After @Override public void tearDown() throws Exception { IgniteUtils.IGNITE_MBEANS_DISABLED = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java index 95011e2..a5e1703 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteFileIOTest.java @@ -21,17 +21,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.util.concurrent.ThreadLocalRandom; -import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; /** * File IO tests. */ -@RunWith(JUnit4.class) -public class IgniteFileIOTest extends TestCase { +public class IgniteFileIOTest { /** Test data size. */ private static final int TEST_DATA_SIZE = 16 * 1024 * 1024; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java index 2ca5f22..312c976 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.file.IgniteNativeIoWithNoPersistenceTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Subset of {@link IgnitePdsTestSuite} suite test, started with direct-oi jar in classpath. */ -public class IgnitePdsNativeIoTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgnitePdsNativeIoTestSuite { /** * @return Suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java index 63234b0..6135c62 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsNativeIoTestSuite2.java @@ -22,11 +22,14 @@ import org.apache.ignite.internal.processors.cache.persistence.DiskPageCompressi import org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest; import org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoPdsRecoveryAfterFileCorruptionTest; import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteNativeIoWalFlushFsyncSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Same as {@link IgnitePdsTestSuite2} but is started with direct-oi jar in classpath. */ -public class IgnitePdsNativeIoTestSuite2 extends TestSuite { +@RunWith(AllTests.class) +public class IgnitePdsNativeIoTestSuite2 { /** * @return Suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTestSuite.java b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTestSuite.java index c9ee957..3fee82e 100644 --- a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTestSuite.java +++ b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.sink.flink; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Apache Flink sink tests. */ -public class FlinkIgniteSinkSelfTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class FlinkIgniteSinkSelfTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTestSuite.java b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTestSuite.java index 091f633..0cd52a7 100644 --- a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTestSuite.java +++ b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTestSuite.java @@ -19,11 +19,14 @@ package org.apache.ignite.stream.flume; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Tests for a Flume sink for Ignite. */ -public class IgniteSinkTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteSinkTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/gce/src/test/java/org/apache/ignite/testsuites/IgniteGCETestSuite.java ---------------------------------------------------------------------- diff --git a/modules/gce/src/test/java/org/apache/ignite/testsuites/IgniteGCETestSuite.java b/modules/gce/src/test/java/org/apache/ignite/testsuites/IgniteGCETestSuite.java index 23fa43f..d95748d 100644 --- a/modules/gce/src/test/java/org/apache/ignite/testsuites/IgniteGCETestSuite.java +++ b/modules/gce/src/test/java/org/apache/ignite/testsuites/IgniteGCETestSuite.java @@ -20,11 +20,14 @@ package org.apache.ignite.testsuites; import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.spi.discovery.tcp.ipfinder.gce.TcpDiscoveryGoogleStorageIpFinderSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Google Compute Engine integration tests. */ -public class IgniteGCETestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteGCETestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/geospatial/src/test/java/org/apache/ignite/testsuites/GeoSpatialIndexingTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/geospatial/src/test/java/org/apache/ignite/testsuites/GeoSpatialIndexingTestSuite.java b/modules/geospatial/src/test/java/org/apache/ignite/testsuites/GeoSpatialIndexingTestSuite.java index 96c9caf..67c06c2 100644 --- a/modules/geospatial/src/test/java/org/apache/ignite/testsuites/GeoSpatialIndexingTestSuite.java +++ b/modules/geospatial/src/test/java/org/apache/ignite/testsuites/GeoSpatialIndexingTestSuite.java @@ -21,11 +21,14 @@ import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.query.h2.H2IndexingGeoSelfTest; import org.apache.ignite.internal.processors.query.h2.H2IndexingSegmentedGeoSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Geospatial indexing tests. */ -public class GeoSpatialIndexingTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class GeoSpatialIndexingTestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java index 1b61d69..b50d9bf 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java @@ -32,6 +32,8 @@ import org.apache.ignite.igfs.IgfsMode; import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint; import org.apache.ignite.internal.util.typedef.G; import org.jetbrains.annotations.Nullable; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC; import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC; @@ -41,7 +43,8 @@ import static org.apache.ignite.igfs.IgfsMode.PRIMARY; * Test suite for IGFS event tests. */ @SuppressWarnings("PublicInnerClass") -public class IgfsEventsTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgfsEventsTestSuite { /** * @return Test suite. * @throws Exception Thrown in case of the failure. http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java index 9da757f..c4cebbf 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java @@ -104,13 +104,16 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; import static org.apache.ignite.testframework.GridTestUtils.modeToPermissionSet; /** * Test suite for Hadoop Map Reduce engine. */ -public class IgniteHadoopTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteHadoopTestSuite { /** * @return Test suite. * @throws Exception Thrown in case of the failure. http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java index c5c7646..ede1f18 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteIgfsLinuxAndMacOSTestSuite.java @@ -33,6 +33,8 @@ import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSy import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientPrimarySelfTest; import org.apache.ignite.internal.processors.hadoop.impl.igfs.IgniteHadoopFileSystemShmemExternalToClientProxySelfTest; import org.apache.ignite.internal.processors.igfs.IgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.downloadHadoop; @@ -40,7 +42,8 @@ import static org.apache.ignite.testsuites.IgniteHadoopTestSuite.downloadHadoop; * Test suite for Hadoop file system over Ignite cache. * Contains tests which works on Linux and Mac OS platform only. */ -public class IgniteIgfsLinuxAndMacOSTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteIgfsLinuxAndMacOSTestSuite { /** * @return Test suite. * @throws Exception Thrown in case of the failure. http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java index 3791bae..84f2f7b 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernateTestSuite.java @@ -20,16 +20,18 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * */ -public class IgniteBinaryHibernateTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteBinaryHibernateTestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); return IgniteHibernateTestSuite.suite(); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java index 2cea470..436203a 100644 --- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java +++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/testsuites/IgniteHibernateTestSuite.java @@ -29,11 +29,14 @@ import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreNodeRestar import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Hibernate integration tests. */ -public class IgniteHibernateTestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteHibernateTestSuite { /** * @return Test suite. */ @@ -42,7 +45,7 @@ public class IgniteHibernateTestSuite extends TestSuite { // Hibernate L2 cache. suite.addTest(new JUnit4TestAdapter(HibernateL2CacheSelfTest.class)); - suite.addTestSuite(HibernateL2CacheTransactionalSelfTest.class); + suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalSelfTest.class)); suite.addTest(new JUnit4TestAdapter(HibernateL2CacheTransactionalUseSyncSelfTest.class)); suite.addTest(new JUnit4TestAdapter(HibernateL2CacheConfigurationSelfTest.class)); suite.addTest(new JUnit4TestAdapter(HibernateL2CacheStrategySelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java index d539511..40ee896 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteBinaryHibernate5TestSuite.java @@ -20,16 +20,18 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.testframework.config.GridTestProperties; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * */ -public class IgniteBinaryHibernate5TestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteBinaryHibernate5TestSuite { /** * @return Test suite. - * @throws Exception If failed. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); return IgniteHibernate5TestSuite.suite(); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java index f64a0c4..f87e676 100644 --- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java +++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/testsuites/IgniteHibernate5TestSuite.java @@ -29,11 +29,14 @@ import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreNodeRestar import org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreSelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreFactorySelfTest; import org.apache.ignite.cache.store.hibernate.CacheHibernateStoreSessionListenerSelfTest; +import org.junit.runner.RunWith; +import org.junit.runners.AllTests; /** * Hibernate integration tests. */ -public class IgniteHibernate5TestSuite extends TestSuite { +@RunWith(AllTests.class) +public class IgniteHibernate5TestSuite { /** * @return Test suite. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java index 4fbb139..601e90b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDynamicLoadOnClientTest.java @@ -39,10 +39,14 @@ import org.apache.ignite.internal.processors.port.GridPortRecord; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test lazy cache start on client nodes with inmemory cache. */ +@RunWith(JUnit4.class) public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** Cache name. */ private static final String PERSON_CACHE = "Person"; @@ -104,6 +108,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { * * @throws Exception If failure. */ + @Test public void testBatchMerge() throws Exception { final int BATCH_SIZE = 7; @@ -128,6 +133,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { * * @throws Exception If failure. */ + @Test public void testClientJdbcDelete() throws Exception { try (Connection con = connect(clientNode); Statement stmt = con.createStatement()) { @@ -146,6 +152,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { * * @throws Exception If failure. */ + @Test public void testClientJdbcInsert() throws Exception { try (Connection con = connect(clientNode); Statement stmt = con.createStatement()) { @@ -165,6 +172,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { * * @throws Exception If failure. */ + @Test public void testClientJdbcUpdate() throws Exception { try (Connection con = connect(clientNode); Statement stmt = con.createStatement()) { @@ -183,6 +191,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { * * @throws Exception If failure. */ + @Test public void testClientJdbc() throws Exception { try (Connection con = connect(clientNode); Statement st = con.createStatement()) { @@ -197,6 +206,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** * Test from client node to put cache elements through cache API. */ + @Test public void testClientPut() { clientNode.cache(PERSON_CACHE).put(-100, new Person(-100, "name-")); @@ -206,6 +216,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** * Test DDL operation for not started cache on client node. */ + @Test public void testCreateIdxOnClient() { getDefaultCacheOnClient().query(new SqlFieldsQuery("CREATE INDEX IDX_11 ON " + FULL_TABLE_NAME + " (name asc)")).getAll(); } @@ -213,6 +224,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** * Test DDL operation for not started cache on client node. */ + @Test public void testDropIdxOnClient() { srvNode.getOrCreateCache(DEFAULT_CACHE_NAME).query(new SqlFieldsQuery("CREATE INDEX IDX_TST ON " + FULL_TABLE_NAME + " (name desc)")).getAll(); @@ -226,6 +238,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** * Test from client node to get cache elements through cache API. */ + @Test public void testClientSqlFieldsQuery() { SqlFieldsQuery qry = new SqlFieldsQuery("SELECT * FROM " + FULL_TABLE_NAME); @@ -235,6 +248,7 @@ public class GridCacheDynamicLoadOnClientTest extends GridCommonAbstractTest { /** * Test from client node to get cache elements through cache API. */ + @Test public void testClientSqlQuery() { SqlQuery<Integer, Person> qry = new SqlQuery<>(PERSON_CACHE, "FROM " + PERSON_CACHE); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index d5b8ccc..2f9332d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -86,6 +86,7 @@ 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 static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -286,6 +287,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testDifferentKeyTypes() throws Exception { final IgniteCache<Object, Object> cache = jcache(Object.class, Object.class); @@ -299,6 +301,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testDifferentValueTypes() throws Exception { IgniteCache<Integer, Object> cache = jcache(Integer.class, Object.class); @@ -314,6 +317,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testStringType() throws Exception { IgniteCache<Integer, String> cache = jcache(Integer.class, String.class); @@ -333,6 +337,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testIntegerType() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -358,6 +363,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testTableAliasInSqlQuery() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -395,6 +401,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws IgniteCheckedException If failed. */ + @Test public void testUserDefinedFunction() throws IgniteCheckedException { // Without alias. final IgniteCache<Object, Object> cache = jcache(Object.class, Object.class); @@ -442,6 +449,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception If failed. */ + @Test public void testExpiration() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -474,6 +482,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testIllegalBounds() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -491,6 +500,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testComplexType() throws Exception { IgniteCache<Key, GridCacheQueryTestValue> cache = jcache(Key.class, GridCacheQueryTestValue.class); @@ -524,6 +534,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception In case of error. */ + @Test public void testComplexTypeKeepBinary() throws Exception { if (ignite().configuration().getMarshaller() == null || ignite().configuration().getMarshaller() instanceof BinaryMarshaller) { IgniteCache<Key, GridCacheQueryTestValue> cache = jcache(Key.class, GridCacheQueryTestValue.class); @@ -596,6 +607,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testSelectQuery() throws Exception { IgniteCache<Integer, String> cache = jcache(Integer.class, String.class); @@ -613,6 +625,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * JUnit. */ + @Test public void testSimpleCustomTableName() { CacheConfiguration<Integer, Object> cacheConf = new CacheConfiguration<Integer, Object>(cacheConfiguration()) .setName(DEFAULT_CACHE_NAME) @@ -654,6 +667,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testMixedCustomTableName() throws Exception { final IgniteCache<Integer, Object> cache = jcache(Integer.class, Object.class); @@ -700,6 +714,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testDistributedJoinCustomTableName() throws Exception { IgniteCache<Integer, Object> cache = jcache(Integer.class, Object.class); @@ -727,6 +742,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testObjectQuery() throws Exception { IgniteCache<Integer, ObjectValue> cache = jcache(Integer.class, ObjectValue.class); @@ -765,6 +781,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testObjectWithString() throws Exception { IgniteCache<Integer, ObjectValue2> cache = jcache(Integer.class, ObjectValue2.class); @@ -799,6 +816,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testEnumObjectQuery() throws Exception { final IgniteCache<Long, EnumObject> cache = jcache(Long.class, EnumObject.class); @@ -934,6 +952,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * JUnit. */ + @Test public void testObjectQueryWithSwap() { CacheConfiguration<Integer, ObjectValue> config = new CacheConfiguration<Integer, ObjectValue>(cacheConfiguration()); @@ -1029,6 +1048,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testFullTextSearch() throws Exception { IgniteCache<Integer, ObjectValue> cache = jcache(Integer.class, ObjectValue.class); @@ -1075,6 +1095,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * * @throws Exception In case of error. */ + @Test public void testScanQuery() throws Exception { IgniteCache<Integer, String> c1 = jcache(Integer.class, String.class); @@ -1113,6 +1134,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception In case of error. */ + @Test public void testScanPartitionQuery() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -1155,6 +1177,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * JUnit. */ + @Test public void testTwoObjectsTextSearch() { CacheConfiguration<Object, Object> conf = new CacheConfiguration<>(cacheConfiguration()); @@ -1185,6 +1208,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testPrimitiveType() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); cache.put(1, 1); @@ -1206,6 +1230,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testPaginationIteratorDefaultCache() throws Exception { testPaginationIterator(jcache(ignite(), cacheConfiguration(), DEFAULT_CACHE_NAME, Integer.class, Integer.class)); } @@ -1213,6 +1238,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testPaginationIteratorNamedCache() throws Exception { testPaginationIterator(jcache(ignite(), cacheConfiguration(), Integer.class, Integer.class)); } @@ -1246,6 +1272,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testPaginationGetDefaultCache() throws Exception { testPaginationGet(jcache(ignite(), cacheConfiguration(), DEFAULT_CACHE_NAME, Integer.class, Integer.class)); } @@ -1253,6 +1280,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testPaginationGetNamedCache() throws Exception { testPaginationGet(jcache(ignite(), cacheConfiguration(), Integer.class, Integer.class)); } @@ -1287,6 +1315,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testScanFilters() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -1323,6 +1352,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws IgniteCheckedException if failed. */ + @Test public void testBadHashObjectKey() throws IgniteCheckedException { IgniteCache<BadHashKeyObject, Byte> cache = jcache(BadHashKeyObject.class, Byte.class); @@ -1337,6 +1367,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws IgniteCheckedException if failed. */ + @Test public void testTextIndexedKey() throws IgniteCheckedException { IgniteCache<ObjectValue, Long> cache = jcache(ObjectValue.class, Long.class); @@ -1352,6 +1383,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testOrderByOnly() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -1382,6 +1414,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testLimitOnly() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -1410,6 +1443,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testArray() throws Exception { IgniteCache<Integer, ArrayObject> cache = jcache(Integer.class, ArrayObject.class); @@ -1433,6 +1467,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testSqlQueryEvents() throws Exception { checkSqlQueryEvents(); } @@ -1440,6 +1475,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testFieldsQueryMetadata() throws Exception { IgniteCache<UUID, Person> cache = jcache(UUID.class, Person.class); @@ -1519,6 +1555,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testScanQueryEvents() throws Exception { final Map<Integer, Integer> map = new ConcurrentHashMap<>(); final IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -1623,6 +1660,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testTextQueryEvents() throws Exception { final Map<UUID, Person> map = new ConcurrentHashMap<>(); final IgniteCache<UUID, Person> cache = jcache(UUID.class, Person.class); @@ -1726,6 +1764,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testFieldsQueryEvents() throws Exception { final IgniteCache<UUID, Person> cache = jcache(UUID.class, Person.class); final boolean evtsDisabled = cache.getConfiguration(CacheConfiguration.class).isEventsDisabled(); @@ -1780,6 +1819,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testLocalSqlQueryFromClient() throws Exception { try { Ignite g = startGrid("client"); @@ -1803,6 +1843,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac /** * @throws Exception If failed. */ + @Test public void testLocalSqlFieldsQueryFromClient() throws Exception { try { Ignite g = startGrid("client"); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java index 145b076..2b98518 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java @@ -38,6 +38,7 @@ 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.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -191,10 +192,9 @@ public class IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid /** * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-5956";) @Test public void testJoin2() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5956";); - join(true, PARTITIONED, REPLICATED, PARTITIONED); } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java index a356f8b..2370563 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFullTextQueryNodeJoiningSelfTest.java @@ -36,6 +36,7 @@ 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.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -48,6 +49,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * Tests cache in-place modification logic with iterative value increment. */ @RunWith(JUnit4.class) +@Ignore("https://issues.apache.org/jira/browse/IGNITE-2229";) public class IgniteCacheFullTextQueryNodeJoiningSelfTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -111,8 +113,6 @@ public class IgniteCacheFullTextQueryNodeJoiningSelfTest extends GridCommonAbstr */ @Test public void testFullTextQueryNodeJoin() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-2229";); - for (int r = 0; r < 5; r++) { startGrids(GRID_CNT); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java index 2cfc6a4..32fe855 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java @@ -37,6 +37,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -50,6 +51,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * */ @RunWith(JUnit4.class) +@Ignore("https://issues.apache.org/jira/browse/IGNITE-5016";) public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -175,10 +177,9 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr /** * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-5016";) @Test public void testJoin() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5016";); - Ignite client = grid(2); IgniteCache<Object, Object> personCache = client.cache(PERSON_CACHE); @@ -229,10 +230,9 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr /** */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-5016";) @Test public void testReplicatedToPartitionedLeftJoin() { - fail("https://issues.apache.org/jira/browse/IGNITE-5016";); - Ignite client = grid(2); IgniteCache<Object, Object> personCache = client.cache(PERSON_CACHE); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java index af0154c..dadedf2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunTest.java @@ -45,6 +45,7 @@ import org.apache.ignite.lang.IgniteRunnable; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -294,10 +295,9 @@ public class IgniteCacheLockPartitionOnAffinityRunTest extends IgniteCacheLockPa /** * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7692";) @Test public void testSingleCache() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7692";); - final PersonsCountGetter personsCntGetter = new PersonsCountGetter() { @Override public int getPersonsCount(IgniteEx ignite, IgniteLogger log, int orgId) throws Exception { return getPersonsCountSingleCache(ignite, log, orgId); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUnionDuplicatesTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUnionDuplicatesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUnionDuplicatesTest.java index be25c83..dfb65f5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUnionDuplicatesTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheUnionDuplicatesTest.java @@ -26,12 +26,16 @@ import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.processors.query.h2.sql.AbstractH2CompareQueryTest; import org.apache.ignite.internal.processors.query.h2.sql.BaseH2CompareQueryTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; /** * */ +@RunWith(JUnit4.class) public class IgniteCacheUnionDuplicatesTest extends AbstractH2CompareQueryTest { /** */ private static IgniteCache<Integer, Organization> pCache; @@ -73,6 +77,7 @@ public class IgniteCacheUnionDuplicatesTest extends AbstractH2CompareQueryTest { /** * @throws Exception If failed. */ + @Test public void testUnionDuplicateFilter() throws Exception { compareQueryRes0(pCache, "select name from \"part\".Organization " + "union " + http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSqlQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSqlQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSqlQueryTest.java index 9f126ef..6cb2c11 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSqlQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBlockOnSqlQueryTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.cache.query.annotations.QuerySqlField; import org.apache.ignite.configuration.CacheConfiguration; import org.jetbrains.annotations.NotNull; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -35,7 +36,6 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED; */ @RunWith(JUnit4.class) public class CacheBlockOnSqlQueryTest extends CacheBlockOnReadAbstractTest { - /** {@inheritDoc} */ @Override @NotNull protected CacheReadBackgroundOperation<?, ?> getReadOperation() { return new CacheReadBackgroundOperation<Integer, TestingEntity>() { @@ -99,71 +99,81 @@ public class CacheBlockOnSqlQueryTest extends CacheBlockOnReadAbstractTest { /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStartServerAtomicPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStartServerTransactionalPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopServerAtomicPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopServerTransactionalPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopBaselineAtomicPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopBaselineTransactionalPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStartClientAtomicPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStartClientTransactionalPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = ATOMIC, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopClientAtomicPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } /** {@inheritDoc} */ @Params(baseline = 1, atomicityMode = TRANSACTIONAL, cacheMode = PARTITIONED) + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9916";) @Test @Override public void testStopClientTransactionalPartitioned() { - fail("https://issues.apache.org/jira/browse/IGNITE-9916";); + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java index 301e6f9..9cfe121 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java @@ -40,6 +40,7 @@ import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.spi.communication.CommunicationSpi; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; +import org.junit.Test; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CachePeekMode.ALL; @@ -66,6 +67,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer /** * @throws Exception If failed. */ + @Test public void testFieldsQuery() throws Exception { Person p1 = new Person("Jon", 1500); Person p2 = new Person("Jane", 2000); @@ -105,6 +107,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer /** * @throws Exception If failed. */ + @Test public void testMultipleNodesQuery() throws Exception { Person p1 = new Person("Jon", 1500); Person p2 = new Person("Jane", 2000); @@ -153,6 +156,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer /** * @throws Exception If failed. */ + @Test public void testScanQueryPagination() throws Exception { final int pageSize = 5; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java index 1d72b8c..e2602ad 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CachePeekMode.ALL; @@ -56,6 +59,7 @@ import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; /** * Tests replicated query. */ +@RunWith(JUnit4.class) public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuerySelfTest { /** */ private static final boolean TEST_DEBUG = false; @@ -116,6 +120,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If failed. */ + @Test public void testClientOnlyNode() throws Exception { try { Ignite g = startGrid("client"); @@ -152,6 +157,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery * * @throws Exception If failed. */ + @Test public void testIterator() throws Exception { int keyCnt = 100; @@ -183,6 +189,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If test failed. */ + @Test public void testLocalQueryWithExplicitFlag() throws Exception { doTestLocalQuery(true); } @@ -190,6 +197,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If test failed. */ + @Test public void testLocalQueryWithoutExplicitFlag() throws Exception { doTestLocalQuery(false); } @@ -227,6 +235,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If test failed. */ + @Test public void testDistributedQuery() throws Exception { final int keyCnt = 4; @@ -279,6 +288,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If test failed. */ + @Test public void testToString() throws Exception { int keyCnt = 4; @@ -296,6 +306,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If failed. */ + @Test public void testLostIterator() throws Exception { IgniteCache<Integer, Integer> cache = jcache(Integer.class, Integer.class); @@ -333,6 +344,7 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery /** * @throws Exception If failed. */ + @Test public void testNodeLeft() throws Exception { Ignite g = startGrid("client"); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java index bd05de1..af46782 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java @@ -332,6 +332,7 @@ public class BasicIndexTest extends GridCommonAbstractTest { } /** */ + @Test public void testDynamicIndexesDropWithPersistence() throws Exception { isPersistenceEnabled = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java index d47d988..4901fda 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionsCommandsWithMvccEnabledSelfTest.java @@ -40,6 +40,7 @@ import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionState; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -137,10 +138,9 @@ public class SqlTransactionsCommandsWithMvccEnabledSelfTest extends AbstractSche /** * Test that attempting to perform various SQL operations within non SQL transaction yields an exception. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9470";) @Test public void testSqlOperationsWithinNonSqlTransaction() { - fail("https://issues.apache.org/jira/browse/IGNITE-9470";); - assertSqlOperationWithinNonSqlTransactionThrows("COMMIT"); assertSqlOperationWithinNonSqlTransactionThrows("ROLLBACK"); http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java index 073bfb0..4683494 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccAbstractContinuousQuerySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.internal.processors.cache.query.continuous.GridCacheContinuousQueryAbstractSelfTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -52,20 +53,23 @@ public abstract class CacheMvccAbstractContinuousQuerySelfTest extends GridCache } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7311";) @Test @Override public void testExpired() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + // No-op. } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7954";) @Test @Override public void testLoadCache() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7954";); + // No-op. } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-9321";) @Test @Override public void testEvents() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-9321";); + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java index b0573b9..147562e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccBackupsAbstractTest.java @@ -46,6 +46,7 @@ import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.plugin.extensions.communication.Message; import org.apache.ignite.transactions.Transaction; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -63,7 +64,6 @@ import static org.junit.Assert.assertArrayEquals; @SuppressWarnings("unchecked") @RunWith(JUnit4.class) public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest { - /** Test timeout. */ private final long txLongTimeout = getTestTimeout() / 4; @@ -186,10 +186,9 @@ public abstract class CacheMvccBackupsAbstractTest extends CacheMvccAbstractTest * * @throws Exception If failed. */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-10104";) @Test public void testBackupsCoherenceWithLargeOperations() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-10104";); - disableScheduledVacuum = true; ccfg = cacheConfiguration(cacheMode(), FULL_SYNC, 1, 10) http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java index ae1e375..696b7e2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerClientSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerClientSelfTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -33,8 +34,9 @@ public class CacheMvccContinuousWithTransformerClientSelfTest extends CacheConti } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7311";) @Test @Override public void testExpired() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java index c38cc7c..a85b8df 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerPartitionedSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerReplicatedSelfTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -39,9 +40,10 @@ public class CacheMvccContinuousWithTransformerPartitionedSelfTest extends Cache } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7311";) @Test @Override public void testExpired() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java index b40972b..b05c878 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccContinuousWithTransformerReplicatedSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.mvcc; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerReplicatedSelfTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; @@ -34,8 +35,9 @@ public class CacheMvccContinuousWithTransformerReplicatedSelfTest } /** {@inheritDoc} */ + @Ignore("https://issues.apache.org/jira/browse/IGNITE-7311";) @Test @Override public void testExpired() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-7311";); + // No-op. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/bf005c83/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSelectForUpdateQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSelectForUpdateQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSelectForUpdateQueryTest.java index a458319..b123e57 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSelectForUpdateQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/mvcc/CacheMvccReplicatedSelectForUpdateQueryTest.java @@ -24,7 +24,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** */ public class CacheMvccReplicatedSelectForUpdateQueryTest extends CacheMvccSelectForUpdateQueryAbstractTest { /** {@inheritDoc} */ - public CacheMode cacheMode() { + @Override public CacheMode cacheMode() { return REPLICATED; } }
