http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java index f660426..56b21f5 100644 --- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java +++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/CompressionProcessorTest.java @@ -41,6 +41,9 @@ import org.apache.ignite.internal.util.GridIntList; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.testframework.junits.GridTestKernalContext; 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.configuration.DiskPageCompression.LZ4; import static org.apache.ignite.configuration.DiskPageCompression.SKIP_GARBAGE; @@ -57,6 +60,7 @@ import static org.apache.ignite.internal.util.GridUnsafe.bufferAddress; /** */ +@RunWith(JUnit4.class) public class CompressionProcessorTest extends GridCommonAbstractTest { /** */ private static final int ITEM_SIZE = 6; // To fill the whole page. @@ -91,6 +95,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageCompact16() throws IgniteCheckedException { blockSize = 16; compression = SKIP_GARBAGE; @@ -101,6 +106,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageCompact128() throws IgniteCheckedException { blockSize = 128; compression = SKIP_GARBAGE; @@ -111,6 +117,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageCompact1k() throws IgniteCheckedException { blockSize = 1024; compression = SKIP_GARBAGE; @@ -121,6 +128,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageCompact2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SKIP_GARBAGE; @@ -131,6 +139,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageZstd16() throws IgniteCheckedException { blockSize = 16; compression = ZSTD; @@ -142,6 +151,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageZstd128() throws IgniteCheckedException { blockSize = 128; compression = ZSTD; @@ -153,6 +163,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageZstd1k() throws IgniteCheckedException { blockSize = 1024; compression = ZSTD; @@ -164,6 +175,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageZstd2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = ZSTD; @@ -175,6 +187,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageSnappy16() throws IgniteCheckedException { blockSize = 16; compression = SNAPPY; @@ -185,6 +198,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageSnappy128() throws IgniteCheckedException { blockSize = 128; compression = SNAPPY; @@ -195,6 +209,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageSnappy1k() throws IgniteCheckedException { blockSize = 1024; compression = SNAPPY; @@ -205,6 +220,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageSnappy2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SNAPPY; @@ -216,6 +232,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Fast16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -227,6 +244,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Fast128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -238,6 +256,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Fast1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -249,6 +268,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Fast2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -260,6 +280,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Slow16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -271,6 +292,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Slow128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -282,6 +304,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Slow1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -293,6 +316,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testDataPageLz4Slow2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -304,6 +328,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageCompact16() throws IgniteCheckedException { blockSize = 16; compression = SKIP_GARBAGE; @@ -314,6 +339,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageCompact16() throws IgniteCheckedException { blockSize = 16; compression = SKIP_GARBAGE; @@ -324,6 +350,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageZstd16() throws IgniteCheckedException { blockSize = 16; compression = ZSTD; @@ -335,6 +362,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageZstd16() throws IgniteCheckedException { blockSize = 16; compression = ZSTD; @@ -347,6 +375,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Fast16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -358,6 +387,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Fast16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -369,6 +399,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Slow16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -380,6 +411,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Slow16() throws IgniteCheckedException { blockSize = 16; compression = LZ4; @@ -391,6 +423,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageSnappy16() throws IgniteCheckedException { blockSize = 16; compression = SNAPPY; @@ -401,6 +434,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageSnappy16() throws IgniteCheckedException { blockSize = 16; compression = SNAPPY; @@ -411,6 +445,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageCompact128() throws IgniteCheckedException { blockSize = 128; compression = SKIP_GARBAGE; @@ -421,6 +456,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageCompact128() throws IgniteCheckedException { blockSize = 128; compression = SKIP_GARBAGE; @@ -431,6 +467,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageZstd128() throws IgniteCheckedException { blockSize = 128; compression = ZSTD; @@ -442,6 +479,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageZstd128() throws IgniteCheckedException { blockSize = 128; compression = ZSTD; @@ -453,6 +491,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Fast128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -464,6 +503,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Fast128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -475,6 +515,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Slow128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -486,6 +527,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Slow128() throws IgniteCheckedException { blockSize = 128; compression = LZ4; @@ -497,6 +539,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageSnappy128() throws IgniteCheckedException { blockSize = 128; compression = SNAPPY; @@ -507,6 +550,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageSnappy128() throws IgniteCheckedException { blockSize = 128; compression = SNAPPY; @@ -517,6 +561,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageCompact1k() throws IgniteCheckedException { blockSize = 1024; compression = SKIP_GARBAGE; @@ -527,6 +572,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageCompact1k() throws IgniteCheckedException { blockSize = 1024; compression = SKIP_GARBAGE; @@ -537,6 +583,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageZstd1k() throws IgniteCheckedException { blockSize = 1024; compression = ZSTD; @@ -548,6 +595,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageZstd1k() throws IgniteCheckedException { blockSize = 1024; compression = ZSTD; @@ -559,6 +607,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Fast1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -570,6 +619,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Fast1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -581,6 +631,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Slow1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -592,6 +643,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Slow1k() throws IgniteCheckedException { blockSize = 1024; compression = LZ4; @@ -603,6 +655,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageSnappy1k() throws IgniteCheckedException { blockSize = 1024; compression = SNAPPY; @@ -613,6 +666,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageSnappy1k() throws IgniteCheckedException { blockSize = 1024; compression = SNAPPY; @@ -623,6 +677,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageCompact2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SKIP_GARBAGE; @@ -633,6 +688,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageCompact2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SKIP_GARBAGE; @@ -643,6 +699,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageZstd2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = ZSTD; @@ -654,6 +711,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageZstd2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = ZSTD; @@ -665,6 +723,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Fast2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -676,6 +735,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Fast2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -687,6 +747,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageLz4Slow2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -698,6 +759,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageLz4Slow2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = LZ4; @@ -709,6 +771,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testInnerPageSnappy2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SNAPPY; @@ -719,6 +782,7 @@ public class CompressionProcessorTest extends GridCommonAbstractTest { /** * @throws IgniteCheckedException If failed. */ + @Test public void testLeafPageSnappy2k() throws IgniteCheckedException { blockSize = 2 * 1024; compression = SNAPPY;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java index ca7f4ea..9b6ed04 100644 --- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java +++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/DiskPageCompressionIntegrationTest.java @@ -48,6 +48,9 @@ import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccess import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.mxbean.CacheGroupMetricsMXBean; 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.configuration.DataStorageConfiguration.MAX_PAGE_SIZE; @@ -64,6 +67,7 @@ import static org.apache.ignite.internal.processors.compress.CompressionProcesso /** * */ +@RunWith(JUnit4.class) public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** */ private DiskPageCompression compression; @@ -112,6 +116,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Zstd_Max() throws Exception { compression = ZSTD; compressionLevel = ZSTD_MAX_LEVEL; @@ -122,6 +127,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Zstd_Default() throws Exception { compression = ZSTD; compressionLevel = null; @@ -132,6 +138,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Zstd_Min() throws Exception { compression = ZSTD; compressionLevel = ZSTD_MIN_LEVEL; @@ -142,6 +149,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Lz4_Max() throws Exception { compression = LZ4; compressionLevel = LZ4_MAX_LEVEL; @@ -152,6 +160,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Lz4_Default() throws Exception { compression = LZ4; compressionLevel = null; @@ -162,6 +171,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Lz4_Min() throws Exception { assertEquals(LZ4_MIN_LEVEL, LZ4_DEFAULT_LEVEL); } @@ -169,6 +179,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_SkipGarbage() throws Exception { compression = SKIP_GARBAGE; @@ -178,6 +189,7 @@ public class DiskPageCompressionIntegrationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPageCompression_Snappy() throws Exception { compression = SNAPPY; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java ---------------------------------------------------------------------- diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java index 70dda0b..c473633 100644 --- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java +++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/compress/FileSystemUtilsTest.java @@ -26,6 +26,9 @@ import java.nio.file.Paths; import junit.framework.TestCase; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.nio.file.StandardOpenOption.READ; import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING; @@ -37,10 +40,12 @@ import static org.apache.ignite.internal.processors.compress.FileSystemUtils.pun /** */ +@RunWith(JUnit4.class) public class FileSystemUtilsTest extends TestCase { /** * @throws Exception If failed. */ + @Test public void testSparseFiles() throws Exception { if (!U.isLinux()) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java index c18361b..a24144d 100644 --- a/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java +++ b/modules/compress/src/test/java/org/apache/ignite/testsuites/IgnitePdsCompressionTestSuite.java @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.compress.CompressionProcessorTest; import org.apache.ignite.internal.processors.compress.DiskPageCompressionIntegrationAsyncTest; @@ -36,10 +37,10 @@ public class IgnitePdsCompressionTestSuite { public static TestSuite suite() { TestSuite suite = new TestSuite("Ignite Persistent Store Test Suite (with page compression)."); - suite.addTestSuite(CompressionProcessorTest.class); - suite.addTestSuite(FileSystemUtilsTest.class); - suite.addTestSuite(DiskPageCompressionIntegrationTest.class); - suite.addTestSuite(DiskPageCompressionIntegrationAsyncTest.class); + suite.addTest(new JUnit4TestAdapter(CompressionProcessorTest.class)); + suite.addTest(new JUnit4TestAdapter(FileSystemUtilsTest.class)); + suite.addTest(new JUnit4TestAdapter(DiskPageCompressionIntegrationTest.class)); + suite.addTest(new JUnit4TestAdapter(DiskPageCompressionIntegrationAsyncTest.class)); enableCompressionByDefault(); IgnitePdsTestSuite.addRealPageStoreTests(suite, null); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java index c040332..8eae8f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryLostPartitionTest.java @@ -133,7 +133,6 @@ public class CacheContinuousQueryLostPartitionTest extends GridCommonAbstractTes * @param cacheName Cache name. * @throws Exception If failed. */ - @Test public void testEvent(String cacheName, boolean client) throws Exception { IgniteCache<Integer, String> cache1 = grid(0).getOrCreateCache(cacheName); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.java b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.java index e2578ae..248ee31 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.java @@ -16,10 +16,15 @@ */ package org.apache.ignite.internal.processors.cache.persistence; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + /** * Version of test to be executed in Direct IO suite. * Contains reduced number of records, because Direct IO does not support tmpfs. */ +@RunWith(JUnit4.class) public class IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest extends LocalWalModeChangeDuringRebalancingSelfTest { /** {@inheritDoc} */ @Override protected int getKeysCount() { @@ -27,6 +32,7 @@ public class IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest extends L } /** {@inheritDoc} */ + @Test @Override public void testWithExchangesMerge() throws Exception { super.testWithExchangesMerge(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 640932dc..95011e2 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 @@ -23,10 +23,14 @@ 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 { /** Test data size. */ private static final int TEST_DATA_SIZE = 16 * 1024 * 1024; @@ -186,6 +190,7 @@ public class IgniteFileIOTest extends TestCase { /** * test for 'full read' functionality. */ + @Test public void testReadFully() throws Exception { byte[] arr = new byte[TEST_DATA_SIZE]; @@ -221,6 +226,7 @@ public class IgniteFileIOTest extends TestCase { /** * test for 'full read' functionality. */ + @Test public void testReadFullyArray() throws Exception { byte[] arr = new byte[TEST_DATA_SIZE]; @@ -242,6 +248,7 @@ public class IgniteFileIOTest extends TestCase { /** * test for 'full write' functionality. */ + @Test public void testWriteFully() throws Exception { byte[] arr = new byte[TEST_DATA_SIZE]; @@ -277,6 +284,7 @@ public class IgniteFileIOTest extends TestCase { /** * test for 'full write' functionality. */ + @Test public void testWriteFullyArray() throws Exception { byte[] arr = new byte[TEST_DATA_SIZE]; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoWithNoPersistenceTest.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoWithNoPersistenceTest.java b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoWithNoPersistenceTest.java index 981e0d5..adef4da 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoWithNoPersistenceTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/file/IgniteNativeIoWithNoPersistenceTest.java @@ -25,10 +25,14 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Checks if Direct IO can be set up if no persistent store is configured */ +@RunWith(JUnit4.class) public class IgniteNativeIoWithNoPersistenceTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @@ -52,6 +56,7 @@ public class IgniteNativeIoWithNoPersistenceTest extends GridCommonAbstractTest * Checks simple launch with native IO. * @throws Exception if failed */ + @Test public void testDirectIoHandlesNoPersistentGrid() throws Exception { IgniteEx ignite = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 6a42464..2ca5f22 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 @@ -16,6 +16,7 @@ */ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.file.IgniteNativeIoWithNoPersistenceTest; @@ -32,10 +33,10 @@ public class IgnitePdsNativeIoTestSuite extends TestSuite { IgnitePdsTestSuite.addRealPageStoreTests(suite, null); //long running test by design with light parameters - suite.addTestSuite(IgnitePdsReplacementNativeIoTest.class); + suite.addTest(new JUnit4TestAdapter(IgnitePdsReplacementNativeIoTest.class)); - suite.addTestSuite(IgniteNativeIoWithNoPersistenceTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteNativeIoWithNoPersistenceTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 867a578..63234b0 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 @@ -16,6 +16,7 @@ */ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.internal.processors.cache.persistence.DiskPageCompressionIntegrationDirectIOTest; import org.apache.ignite.internal.processors.cache.persistence.IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest; @@ -35,14 +36,14 @@ public class IgnitePdsNativeIoTestSuite2 extends TestSuite { IgnitePdsTestSuite2.addRealPageStoreTests(suite, null); // Direct IO + Page compression. - suite.addTestSuite(DiskPageCompressionIntegrationDirectIOTest.class); + suite.addTest(new JUnit4TestAdapter(DiskPageCompressionIntegrationDirectIOTest.class)); //Integrity test with reduced count of pages. - suite.addTestSuite(IgniteNativeIoPdsRecoveryAfterFileCorruptionTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteNativeIoPdsRecoveryAfterFileCorruptionTest.class)); - suite.addTestSuite(IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteNativeIoLocalWalModeChangeDuringRebalancingSelfTest.class)); - suite.addTestSuite(IgniteNativeIoWalFlushFsyncSelfTest.class); + suite.addTest(new JUnit4TestAdapter(IgniteNativeIoWalFlushFsyncSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsReplacementNativeIoTest.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsReplacementNativeIoTest.java b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsReplacementNativeIoTest.java index f9bda76..1d3f91e 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsReplacementNativeIoTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/testsuites/IgnitePdsReplacementNativeIoTest.java @@ -18,10 +18,14 @@ package org.apache.ignite.testsuites; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.processors.cache.persistence.db.file.IgnitePdsPageReplacementTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Page replacement light variant of test for native direct IO (wastes real IOPs on agents) */ +@RunWith(JUnit4.class) public class IgnitePdsReplacementNativeIoTest extends IgnitePdsPageReplacementTest { /** {@inheritDoc} */ @@ -36,6 +40,7 @@ public class IgnitePdsReplacementNativeIoTest extends IgnitePdsPageReplacementTe } /** {@inheritDoc} */ + @Test @Override public void testPageReplacement() throws Exception { System.setProperty(IgniteSystemProperties.IGNITE_USE_ASYNC_FILE_IO_FACTORY, "false"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java index eb59379..3c9e408 100644 --- a/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java +++ b/modules/flink/src/test/java/org/apache/ignite/sink/flink/FlinkIgniteSinkSelfTest.java @@ -23,10 +23,14 @@ import org.apache.flink.configuration.Configuration; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests for {@link IgniteSink}. */ +@RunWith(JUnit4.class) public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { /** Cache name. */ private static final String TEST_CACHE = "testCache"; @@ -34,6 +38,7 @@ public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { /** Ignite test configuration file. */ private static final String GRID_CONF_FILE = "modules/flink/src/test/resources/example-ignite.xml"; + @Test public void testIgniteSink() throws Exception { Configuration configuration = new Configuration(); @@ -56,6 +61,7 @@ public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { assertEquals("testValue", igniteSink.getIgnite().getOrCreateCache(TEST_CACHE).get("testData")); } + @Test public void testIgniteSinkStreamExecution() throws Exception { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); @@ -78,4 +84,4 @@ public class FlinkIgniteSinkSelfTest extends GridCommonAbstractTest { fail("Stream execution process failed."); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 b6934e2..c9ee957 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 @@ -17,21 +17,20 @@ package org.apache.ignite.sink.flink; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; /** * Apache Flink sink tests. */ public class FlinkIgniteSinkSelfTestSuite extends TestSuite { - /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Apache Flink sink Test Suite"); - suite.addTest(new TestSuite(FlinkIgniteSinkSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(FlinkIgniteSinkSelfTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java ---------------------------------------------------------------------- diff --git a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java index 73e61e7..90d5dd5 100644 --- a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java +++ b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java @@ -33,12 +33,16 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.lang.IgnitePredicate; 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.events.EventType.EVT_CACHE_OBJECT_PUT; /** * {@link IgniteSink} test. */ +@RunWith(JUnit4.class) public class IgniteSinkTest extends GridCommonAbstractTest { /** Number of events to be sent to memory channel. */ private static final int EVENT_CNT = 10000; @@ -49,6 +53,7 @@ public class IgniteSinkTest extends GridCommonAbstractTest { /** * @throws Exception {@link Exception}. */ + @Test public void testSink() throws Exception { IgniteConfiguration cfg = loadConfiguration("modules/flume/src/test/resources/example-ignite.xml"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 ad6d162..091f633 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 @@ -17,6 +17,7 @@ package org.apache.ignite.stream.flume; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; /** @@ -25,12 +26,11 @@ import junit.framework.TestSuite; public class IgniteSinkTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Apache Flume NG Sink Test Suite"); - suite.addTest(new TestSuite(IgniteSinkTest.class)); + suite.addTest(new JUnit4TestAdapter(IgniteSinkTest.class)); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 147abad..23fa43f 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 @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +import junit.framework.JUnit4TestAdapter; import junit.framework.TestSuite; import org.apache.ignite.spi.discovery.tcp.ipfinder.gce.TcpDiscoveryGoogleStorageIpFinderSelfTest; @@ -26,12 +27,11 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.gce.TcpDiscoveryGoogleStorag public class IgniteGCETestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("Google Compute Engine Integration Test Suite"); - suite.addTest(new TestSuite(TcpDiscoveryGoogleStorageIpFinderSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(TcpDiscoveryGoogleStorageIpFinderSelfTest.class)); return suite; } @@ -68,4 +68,4 @@ public class IgniteGCETestSuite extends TestSuite { return name; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java index 9c5038e..a1f47b6 100644 --- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java +++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/H2IndexingAbstractGeoSelfTest.java @@ -36,6 +36,9 @@ import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.NotNull; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.io.ParseException; import org.locationtech.jts.io.WKTReader; @@ -57,6 +60,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * Geo-indexing test. */ +@RunWith(JUnit4.class) public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSelfTest { /** */ private static final int CNT = 100; @@ -233,6 +237,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel /** * @throws Exception If failed. */ + @Test public void testPrimitiveGeometry() throws Exception { IgniteCache<Long, Geometry> cache = createCache("geom", true, Long.class, Geometry.class); @@ -258,6 +263,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception If failed. */ + @Test public void testGeo() throws Exception { checkGeo(false); } @@ -267,6 +273,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception If failed. */ + @Test public void testGeoDynamic() throws Exception { checkGeo(true); } @@ -349,6 +356,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception If failed. */ + @Test public void testGeoMultithreaded() throws Exception { checkGeoMultithreaded(false); } @@ -358,6 +366,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception If failed. */ + @Test public void testGeoMultithreadedDynamic() throws Exception { checkGeoMultithreaded(true); } @@ -493,6 +502,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception if fails. */ + @Test public void testSegmentedGeoIndexJoinPartitioned() throws Exception { checkSegmentedGeoIndexJoin(true, false); } @@ -502,6 +512,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception if fails. */ + @Test public void testSegmentedGeoIndexJoinPartitionedDynamic() throws Exception { checkSegmentedGeoIndexJoin(true, true); } @@ -511,6 +522,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception if fails. */ + @Test public void testSegmentedGeoIndexJoinReplicated() throws Exception { checkSegmentedGeoIndexJoin(false, false); } @@ -520,6 +532,7 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel * * @throws Exception if fails. */ + @Test public void testSegmentedGeoIndexJoinReplicatedDynamic() throws Exception { checkSegmentedGeoIndexJoin(false, true); } @@ -674,4 +687,4 @@ public abstract class H2IndexingAbstractGeoSelfTest extends GridCacheAbstractSel this.name = name; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/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 22109de..96c9caf 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 @@ -17,6 +17,7 @@ package org.apache.ignite.testsuites; +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; @@ -27,14 +28,13 @@ import org.apache.ignite.internal.processors.query.h2.H2IndexingSegmentedGeoSelf public class GeoSpatialIndexingTestSuite extends TestSuite { /** * @return Test suite. - * @throws Exception Thrown in case of the failure. */ - public static TestSuite suite() throws Exception { + public static TestSuite suite() { TestSuite suite = new TestSuite("H2 Geospatial Indexing Test Suite"); - suite.addTestSuite(H2IndexingGeoSelfTest.class); - suite.addTestSuite(H2IndexingSegmentedGeoSelfTest.class); + suite.addTest(new JUnit4TestAdapter(H2IndexingGeoSelfTest.class)); + suite.addTest(new JUnit4TestAdapter(H2IndexingSegmentedGeoSelfTest.class)); return suite; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java index 7c61e3f..76d7605 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java @@ -46,10 +46,14 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test of integration with Hadoop client via command line interface. */ +@RunWith(JUnit4.class) public class HadoopCommandLineTest extends GridCommonAbstractTest { /** IGFS instance. */ private IgfsEx igfs; @@ -354,6 +358,7 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest { /** * Tests Hadoop command line integration. */ + @Test public void testHadoopCommandLine() throws Exception { assertEquals(0, executeHadoopCmd("fs", "-ls", "/")); @@ -430,6 +435,7 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest { /** * Tests Hive integration. */ + @Test public void testHiveCommandLine() throws Exception { assertEquals(0, executeHiveQuery( "create table table_a (" + @@ -491,4 +497,4 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest { checkQuery("1000\n", "select count(b.id_b) from table_a a inner join table_b b on a.id_b = b.id_b"); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopFileSystemsTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopFileSystemsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopFileSystemsTest.java index 7680690..4a4ea6f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopFileSystemsTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopFileSystemsTest.java @@ -28,10 +28,14 @@ import org.apache.hadoop.mapreduce.MRJobConfig; import org.apache.ignite.internal.processors.hadoop.impl.fs.HadoopFileSystemsUtils; import org.apache.ignite.internal.processors.hadoop.impl.fs.HadoopLocalFileSystemV1; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test file systems for the working directory multi-threading support. */ +@RunWith(JUnit4.class) public class HadoopFileSystemsTest extends HadoopAbstractSelfTest { /** the number of threads */ private static final int THREAD_COUNT = 3; @@ -158,7 +162,8 @@ public class HadoopFileSystemsTest extends HadoopAbstractSelfTest { * * @throws Exception If fails. */ + @Test public void testLocal() throws Exception { testFileSystem(URI.create("file:///")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java index d27a234..8ca1b86 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopGroupingTest.java @@ -47,12 +47,16 @@ import java.util.List; import java.util.Random; import java.util.Set; import java.util.UUID; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.createJobInfo; /** * Grouping test. */ +@RunWith(JUnit4.class) public class HadoopGroupingTest extends HadoopAbstractSelfTest { /** {@inheritDoc} */ @Override protected int gridCount() { @@ -60,7 +64,7 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest { } /** {@inheritDoc} */ - protected boolean igfsEnabled() { + @Override protected boolean igfsEnabled() { return false; } @@ -87,6 +91,7 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testGroupingReducer() throws Exception { doTestGrouping(false); } @@ -94,6 +99,7 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testGroupingCombiner() throws Exception { doTestGrouping(true); } @@ -299,4 +305,4 @@ public class HadoopGroupingTest extends HadoopAbstractSelfTest { return null; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java index 7f94def..5d69f41 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java @@ -43,6 +43,9 @@ import org.apache.ignite.internal.processors.hadoop.Hadoop; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.processors.hadoop.HadoopJobStatus; import org.apache.ignite.internal.util.typedef.internal.U; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.createJobInfo; import static org.apache.ignite.internal.processors.hadoop.state.HadoopJobTrackerSelfTestState.combineExecCnt; @@ -53,6 +56,7 @@ import static org.apache.ignite.internal.processors.hadoop.state.HadoopJobTracke /** * Job tracker self test. */ +@RunWith(JUnit4.class) public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest { /** */ private static final String PATH_OUTPUT = "/test-out"; @@ -99,6 +103,7 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testSimpleTaskSubmit() throws Exception { try { UUID globalId = UUID.randomUUID(); @@ -145,6 +150,7 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testTaskWithCombinerPerMap() throws Exception { try { UUID globalId = UUID.randomUUID(); @@ -323,4 +329,4 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest { System.out.println("Completed task: " + ctx.getTaskAttemptID().getTaskID().getId()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java index 21b7ee2..9d750c9 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceEmbeddedSelfTest.java @@ -37,6 +37,9 @@ import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.processors.hadoop.HadoopJobProperty; import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCount1; import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCount2; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.createJobInfo; import static org.apache.ignite.internal.processors.hadoop.state.HadoopMapReduceEmbeddedSelfTestState.flags; @@ -44,6 +47,7 @@ import static org.apache.ignite.internal.processors.hadoop.state.HadoopMapReduce /** * Tests map-reduce execution with embedded mode. */ +@RunWith(JUnit4.class) public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { /** {@inheritDoc} */ @Override public HadoopConfiguration hadoopConfiguration(String igniteInstanceName) { @@ -58,6 +62,7 @@ public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { /** * @throws Exception If fails. */ + @Test public void testMultiReducerWholeMapReduceExecution() throws Exception { checkMultiReducerWholeMapReduceExecution(false); } @@ -65,6 +70,7 @@ public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { /** * @throws Exception If fails. */ + @Test public void testMultiReducerWholeMapReduceExecutionStriped() throws Exception { checkMultiReducerWholeMapReduceExecution(true); } @@ -268,4 +274,4 @@ public class HadoopMapReduceEmbeddedSelfTest extends HadoopMapReduceTest { flags.put("outputFormatWasConfigured", true); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceErrorResilienceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceErrorResilienceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceErrorResilienceTest.java index afd6f26..afd636d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceErrorResilienceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceErrorResilienceTest.java @@ -19,6 +19,9 @@ package org.apache.ignite.internal.processors.hadoop.impl; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCount2; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test of error resiliency after an error in a map-reduce job execution. @@ -27,12 +30,14 @@ import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCoun * x { unchecked exception, checked exception, error } * x { phase where the error happens }. */ +@RunWith(JUnit4.class) public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceTest { /** * Tests recovery. * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError0_Runtime() throws Exception { doTestRecoveryAfterAnError(0, HadoopErrorSimulator.Kind.Runtime); } @@ -42,6 +47,7 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError0_IOException() throws Exception { doTestRecoveryAfterAnError(0, HadoopErrorSimulator.Kind.IOException); } @@ -51,6 +57,7 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError0_Error() throws Exception { doTestRecoveryAfterAnError(0, HadoopErrorSimulator.Kind.Error); } @@ -60,6 +67,7 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError7_Runtime() throws Exception { doTestRecoveryAfterAnError(7, HadoopErrorSimulator.Kind.Runtime); } @@ -68,6 +76,7 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError7_IOException() throws Exception { doTestRecoveryAfterAnError(7, HadoopErrorSimulator.Kind.IOException); } @@ -76,6 +85,7 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT * * @throws Exception If failed. */ + @Test public void testRecoveryAfterAnError7_Error() throws Exception { doTestRecoveryAfterAnError(7, HadoopErrorSimulator.Kind.Error); } @@ -151,4 +161,4 @@ public class HadoopMapReduceErrorResilienceTest extends HadoopAbstractMapReduceT // Expect success there: doTest(inFile, useNewMapper, useNewCombiner, useNewReducer); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceTest.java index feccb59..04091d0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopMapReduceTest.java @@ -19,15 +19,20 @@ package org.apache.ignite.internal.processors.hadoop.impl; import org.apache.ignite.igfs.IgfsPath; import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCount2; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test of whole cycle of map-reduce processing via Job tracker. */ +@RunWith(JUnit4.class) public class HadoopMapReduceTest extends HadoopAbstractMapReduceTest { /** * Tests whole job execution with all phases in all combination of new and old versions of API. * @throws Exception If fails. */ + @Test public void testWholeMapReduceExecution() throws Exception { IgfsPath inDir = new IgfsPath(PATH_INPUT); @@ -63,4 +68,4 @@ public class HadoopMapReduceTest extends HadoopAbstractMapReduceTest { { true, true, true }, }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java index 382631d..e59f9dd 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopNoHadoopMapReduceTest.java @@ -18,10 +18,14 @@ package org.apache.ignite.internal.processors.hadoop.impl; import org.apache.ignite.configuration.IgniteConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test attempt to execute a map-reduce task while no Hadoop processor available. */ +@RunWith(JUnit4.class) public class HadoopNoHadoopMapReduceTest extends HadoopMapReduceTest { /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { @@ -34,6 +38,7 @@ public class HadoopNoHadoopMapReduceTest extends HadoopMapReduceTest { } /** {@inheritDoc} */ + @Test @Override public void testWholeMapReduceExecution() throws Exception { try { super.testWholeMapReduceExecution(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSerializationWrapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSerializationWrapperSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSerializationWrapperSelfTest.java index 5ccc8ce..b1f16e0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSerializationWrapperSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSerializationWrapperSelfTest.java @@ -30,15 +30,20 @@ import org.apache.hadoop.io.serializer.WritableSerialization; import org.apache.ignite.internal.processors.hadoop.HadoopSerialization; import org.apache.ignite.internal.processors.hadoop.impl.v2.HadoopSerializationWrapper; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test of wrapper of the native serialization. */ +@RunWith(JUnit4.class) public class HadoopSerializationWrapperSelfTest extends GridCommonAbstractTest { /** * Tests read/write of IntWritable via native WritableSerialization. * @throws Exception If fails. */ + @Test public void testIntWritableSerialization() throws Exception { HadoopSerialization ser = new HadoopSerializationWrapper(new WritableSerialization(), IntWritable.class); @@ -61,6 +66,7 @@ public class HadoopSerializationWrapperSelfTest extends GridCommonAbstractTest { * Tests read/write of Integer via native JavaleSerialization. * @throws Exception If fails. */ + @Test public void testIntJavaSerialization() throws Exception { HadoopSerialization ser = new HadoopSerializationWrapper(new JavaSerialization(), Integer.class); @@ -77,4 +83,4 @@ public class HadoopSerializationWrapperSelfTest extends GridCommonAbstractTest { assertEquals(3, ((Integer)ser.read(in, null)).intValue()); assertEquals(-5, ((Integer)ser.read(in, null)).intValue()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSnappyTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSnappyTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSnappyTest.java index 80ff754..6958520 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSnappyTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSnappyTest.java @@ -32,10 +32,14 @@ import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader; import org.apache.ignite.internal.processors.hadoop.HadoopHelperImpl; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests isolated Hadoop Snappy codec usage. */ +@RunWith(JUnit4.class) public class HadoopSnappyTest extends GridCommonAbstractTest { /** Length of data. */ private static final int BYTE_SIZE = 1024 * 50; @@ -45,6 +49,7 @@ public class HadoopSnappyTest extends GridCommonAbstractTest { * * @throws Exception On error. */ + @Test public void testSnappy() throws Throwable { // Run Snappy test in default class loader: checkSnappy(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java index bb11ccb..dc84913 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSortingTest.java @@ -50,12 +50,16 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.configuration.HadoopConfiguration; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.util.typedef.X; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.createJobInfo; /** * Tests correct sorting. */ +@RunWith(JUnit4.class) public class HadoopSortingTest extends HadoopAbstractSelfTest { /** */ private static final String PATH_INPUT = "/test-in"; @@ -98,6 +102,7 @@ public class HadoopSortingTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testSortSimple() throws Exception { // Generate test data. Job job = Job.getInstance(); @@ -301,4 +306,4 @@ public class HadoopSortingTest extends HadoopAbstractSelfTest { len = in.readInt(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSplitWrapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSplitWrapperSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSplitWrapperSelfTest.java index be2bfc2..4c661a6 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSplitWrapperSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopSplitWrapperSelfTest.java @@ -29,15 +29,20 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapper; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Self test of {@link HadoopSplitWrapper}. */ +@RunWith(JUnit4.class) public class HadoopSplitWrapperSelfTest extends HadoopAbstractSelfTest { /** * Tests serialization of wrapper and the wrapped native split. * @throws Exception If fails. */ + @Test public void testSerialization() throws Exception { FileSplit nativeSplit = new FileSplit(new Path("/path/to/file"), 100, 500, new String[]{"host1", "host2"}); @@ -69,4 +74,4 @@ public class HadoopSplitWrapperSelfTest extends HadoopAbstractSelfTest { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java index bc59c76..afd5ac7 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java @@ -52,6 +52,9 @@ import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.state.HadoopTaskExecutionSelfTestValues.cancelledTasks; import static org.apache.ignite.internal.processors.hadoop.state.HadoopTaskExecutionSelfTestValues.executedTasks; @@ -64,6 +67,7 @@ import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.crea /** * Tests map-reduce task execution basics. */ +@RunWith(JUnit4.class) public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** Test param. */ private static final String MAP_WRITE = "test.map.write"; @@ -107,6 +111,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testMapRun() throws Exception { int lineCnt = 10000; String fileName = "/testFile"; @@ -148,6 +153,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testMapCombineRun() throws Exception { int lineCnt = 10001; String fileName = "/testFile"; @@ -196,6 +202,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testMapperException() throws Exception { prepareFile("/testFile", 1000); @@ -301,6 +308,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testTaskCancelling() throws Exception { Configuration cfg = prepareJobForCancelling(); @@ -345,6 +353,7 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { /** * @throws Exception If failed. */ + @Test public void testJobKill() throws Exception { Configuration cfg = prepareJobForCancelling(); @@ -541,4 +550,4 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest { totalLineCnt.addAndGet(lineCnt); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTasksVersionsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTasksVersionsAbstractTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTasksVersionsAbstractTest.java index 836073a..5194ea4 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTasksVersionsAbstractTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTasksVersionsAbstractTest.java @@ -32,10 +32,14 @@ import org.apache.ignite.internal.processors.hadoop.HadoopJobEx; import org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo; import org.apache.ignite.internal.processors.hadoop.HadoopTaskType; import org.apache.ignite.internal.processors.hadoop.impl.examples.HadoopWordCount2; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests of Map, Combine and Reduce task executions of any version of hadoop API. */ +@RunWith(JUnit4.class) abstract class HadoopTasksVersionsAbstractTest extends HadoopAbstractWordCountTest { /** Empty hosts array. */ private static final String[] HOSTS = new String[0]; @@ -61,6 +65,7 @@ abstract class HadoopTasksVersionsAbstractTest extends HadoopAbstractWordCountTe * @throws Exception If fails. */ @SuppressWarnings("ConstantConditions") + @Test public void testMapTask() throws Exception { IgfsPath inDir = new IgfsPath(PATH_INPUT); @@ -140,6 +145,7 @@ abstract class HadoopTasksVersionsAbstractTest extends HadoopAbstractWordCountTe * * @throws Exception If fails. */ + @Test public void testReduceTask() throws Exception { HadoopJobEx gridJob = getHadoopJob(igfsScheme() + PATH_INPUT, igfsScheme() + PATH_OUTPUT); @@ -166,6 +172,7 @@ abstract class HadoopTasksVersionsAbstractTest extends HadoopAbstractWordCountTe * * @throws Exception If fails. */ + @Test public void testCombinerTask() throws Exception { HadoopJobEx gridJob = getHadoopJob("/", "/"); @@ -214,6 +221,7 @@ abstract class HadoopTasksVersionsAbstractTest extends HadoopAbstractWordCountTe * @throws Exception If fails. */ @SuppressWarnings("ConstantConditions") + @Test public void testAllTasks() throws Exception { IgfsPath inDir = new IgfsPath(PATH_INPUT); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java index 46752a8..f3d98da 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTeraSortTest.java @@ -45,12 +45,16 @@ import org.apache.ignite.hadoop.io.TextPartiallyRawComparator; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.hadoop.HadoopJobId; import org.apache.ignite.internal.processors.hadoop.HadoopJobProperty; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.internal.processors.hadoop.impl.HadoopUtils.createJobInfo; /** * Implements TeraSort Hadoop sample as a unit test. */ +@RunWith(JUnit4.class) public class HadoopTeraSortTest extends HadoopAbstractSelfTest { /** Copy of Hadoop constant of package-private visibility. */ public static final String PARTITION_FILENAME = getPartitionFileNameConstant(); @@ -356,6 +360,7 @@ public class HadoopTeraSortTest extends HadoopAbstractSelfTest { * * @throws Exception If failed. */ + @Test public void testTeraSort() throws Exception { checkTeraSort(false); } @@ -365,6 +370,7 @@ public class HadoopTeraSortTest extends HadoopAbstractSelfTest { * * @throws Exception If failed. */ + @Test public void testTeraSortGzip() throws Exception { checkTeraSort(true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTxConfigCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTxConfigCacheTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTxConfigCacheTest.java index f404732..f803084 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTxConfigCacheTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTxConfigCacheTest.java @@ -21,17 +21,22 @@ import org.apache.ignite.Ignite; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.IgniteTxConfigCacheSelfTest; import org.apache.ignite.internal.util.typedef.internal.CU; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test checks whether hadoop system cache doesn't use user defined TX config. */ +@RunWith(JUnit4.class) public class HadoopTxConfigCacheTest extends IgniteTxConfigCacheSelfTest { /** * Success if system caches weren't timed out. * * @throws Exception If failed. */ - public void testSystemCacheTx() throws Exception { + @Test + @Override public void testSystemCacheTx() throws Exception { final Ignite ignite = grid(0); final IgniteInternalCache<Object, Object> hadoopCache = getSystemCache(ignite, CU.SYS_CACHE_HADOOP_MR); @@ -39,4 +44,4 @@ public class HadoopTxConfigCacheTest extends IgniteTxConfigCacheSelfTest { checkImplicitTxSuccess(hadoopCache); checkStartTxSuccess(hadoopCache); } -} \ No newline at end of file +}
