http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataConcurrentUpdateWithIndexesTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataConcurrentUpdateWithIndexesTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataConcurrentUpdateWithIndexesTest.java index 9bbdfad..ac4c2eb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataConcurrentUpdateWithIndexesTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryMetadataConcurrentUpdateWithIndexesTest.java @@ -61,6 +61,9 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.testframework.GridTestUtils.runAsync; @@ -81,6 +84,7 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA * nodes or tx will fail on commit.</li> * </ul> */ +@RunWith(JUnit4.class) public class BinaryMetadataConcurrentUpdateWithIndexesTest extends GridCommonAbstractTest { /** */ private static final int FIELDS = 2; @@ -152,6 +156,7 @@ public class BinaryMetadataConcurrentUpdateWithIndexesTest extends GridCommonAbs public static final CountDownLatch localMetaUpdatedLatch = new CountDownLatch(1); /** */ + @Test public void testMissingSchemaUpdate() throws Exception { // Start order is important. Ignite node0 = startGrid("node0");
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java index 4b3c881..74c834a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinarySerializationQuerySelfTest.java @@ -56,10 +56,14 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for query with BinaryMarshaller and different serialization modes. */ +@RunWith(JUnit4.class) public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { /** Ignite instance. */ private Ignite ignite; @@ -159,6 +163,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testPlain() throws Exception { check(EntityPlain.class); } @@ -168,6 +173,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testSerializable() throws Exception { check(EntitySerializable.class); } @@ -177,6 +183,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testExternalizable() throws Exception { check(EntityExternalizable.class); } @@ -186,6 +193,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testBinarylizable() throws Exception { check(EntityBinarylizable.class); } @@ -195,6 +203,7 @@ public class BinarySerializationQuerySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testWriteReadObject() throws Exception { check(EntityWriteReadObject.class); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java index 7a41a6a..bf9796d 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BinaryTypeMismatchLoggingTest.java @@ -34,11 +34,14 @@ import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.testframework.GridStringLogger; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; - +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests of binary type mismatch logging. */ +@RunWith(JUnit4.class) public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** */ public static final String MESSAGE_PAYLOAD_VALUE = "expValType=Payload, actualValType=o.a.i.i.processors.cache.BinaryTypeMismatchLoggingTest$Payload"; @@ -49,6 +52,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testValueReadCreateTable() throws Exception { Ignite ignite = startGrid(0); @@ -74,6 +78,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testValueReadQueryEntities() throws Exception { Ignite ignite = startGrid(0); @@ -102,6 +107,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testEntryReadCreateTable() throws Exception { Ignite ignite = startGrid(0); @@ -127,6 +133,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testEntryReadQueryEntities() throws Exception { Ignite ignite = startGrid(0); @@ -156,6 +163,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testValueWriteCreateTable() throws Exception { Ignite ignite = startGridWithLogCapture(); @@ -185,6 +193,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testValueWriteQueryEntities() throws Exception { Ignite ignite = startGridWithLogCapture(); @@ -209,6 +218,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testEntryWriteCreateTable() throws Exception { Ignite ignite = startGridWithLogCapture(); @@ -242,6 +252,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testEntryWriteQueryEntities() throws Exception { Ignite ignite = startGridWithLogCapture(); @@ -277,6 +288,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testEntryWriteCacheIsolation() throws Exception { Ignite ignite = startGridWithLogCapture(); @@ -309,6 +321,7 @@ public class BinaryTypeMismatchLoggingTest extends GridCommonAbstractTest { /** * @throws Exception In case of an error. */ + @Test public void testValueWriteMultipleQueryEntities() throws Exception { Ignite ignite = startGridWithLogCapture(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java index e1d7154..151fcea 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryDetailMetricsSelfTest.java @@ -36,12 +36,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for cache query details metrics. */ +@RunWith(JUnit4.class) public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommonAbstractTest { /** */ private static final int QRY_DETAIL_METRICS_SIZE = 3; @@ -110,6 +114,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -123,6 +128,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -137,6 +143,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -150,6 +157,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testQueryMetricsEviction() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -258,6 +266,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testQueryMetricsMultithreaded() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -286,6 +295,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testScanQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -299,6 +309,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testScanQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -313,6 +324,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testScanQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -326,6 +338,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -339,6 +352,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -353,6 +367,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testTextQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -366,6 +381,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testTextQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -380,6 +396,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testTextQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -393,6 +410,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -406,6 +424,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -420,6 +439,7 @@ public abstract class CacheAbstractQueryDetailMetricsSelfTest extends GridCommon * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java index e1c796b..27e61e5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheAbstractQueryMetricsSelfTest.java @@ -36,12 +36,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for cache query metrics. */ +@RunWith(JUnit4.class) public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstractTest { /** Grid count. */ protected int gridCnt; @@ -106,6 +110,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -119,6 +124,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -133,6 +139,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -146,6 +153,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testScanQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -159,6 +167,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testScanQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -173,6 +182,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testScanQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -186,6 +196,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -199,6 +210,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -213,6 +225,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testTextQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -226,6 +239,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testTextQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -240,6 +254,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testTextQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -253,6 +268,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -266,6 +282,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryNotFullyFetchedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -280,6 +297,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testSqlFieldsCrossCacheQueryFailedMetrics() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); @@ -313,6 +331,7 @@ public abstract class CacheAbstractQueryMetricsSelfTest extends GridCommonAbstra * * @throws Exception In case of error. */ + @Test public void testQueryMetricsMultithreaded() throws Exception { IgniteCache<Integer, String> cache = grid(0).context().cache().jcache("A"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java index 0582132..f99da27 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java @@ -43,6 +43,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -53,6 +56,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; * */ @SuppressWarnings("unchecked") +@RunWith(JUnit4.class) public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -84,6 +88,7 @@ public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutAndQueries() throws Exception { Ignite ignite = ignite(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java index 3777154..765e3f7 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheConfigurationP2PTest.java @@ -33,12 +33,16 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.SECONDS; /** * */ +@RunWith(JUnit4.class) public class CacheConfigurationP2PTest extends GridCommonAbstractTest { /** */ public static final String NODE_START_MSG = "Test external node started"; @@ -75,6 +79,7 @@ public class CacheConfigurationP2PTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testCacheConfigurationP2P() throws Exception { fail("Enable when IGNITE-537 is fixed."); @@ -181,4 +186,4 @@ public class CacheConfigurationP2PTest extends GridCommonAbstractTest { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java index dda7eed..ae5879a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java @@ -33,6 +33,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -41,6 +44,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class CacheIndexStreamerTest extends GridCommonAbstractTest { /** */ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -57,6 +61,7 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStreamerAtomic() throws Exception { checkStreamer(ATOMIC); } @@ -64,6 +69,7 @@ public class CacheIndexStreamerTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testStreamerTx() throws Exception { checkStreamer(TRANSACTIONAL); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java index f0d1f37..47b8e24 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java @@ -30,6 +30,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import javax.cache.Cache; import java.util.Collections; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -37,6 +40,7 @@ import static org.apache.ignite.cache.CacheMode.REPLICATED; /** * Node filter test. */ +@RunWith(JUnit4.class) public class CacheIteratorScanQueryTest extends GridCommonAbstractTest { /** Client mode. */ private boolean client = false; @@ -74,6 +78,7 @@ public class CacheIteratorScanQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testScanQuery() throws Exception { Ignite server = startGrid(0); @@ -107,6 +112,7 @@ public class CacheIteratorScanQueryTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueryGetAllClientSide() throws Exception { Ignite server = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java index c422a74..f0a68ad 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingMultiTypeTest.java @@ -21,15 +21,20 @@ import java.util.Map; import java.util.TreeMap; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests various cache operations with indexing enabled. * Cache contain multiple types. */ +@RunWith(JUnit4.class) public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchIndexingBaseTest { /** * Tests putAll with multiple indexed entities and streamer pre-loading with low off-heap cache size. */ + @Test public void testPutAllMultupleEntitiesAndStreamer() { doStreamerBatchTest(50, 1_000, new Class<?>[] { Integer.class, CacheOffheapBatchIndexingBaseTest.Person.class, @@ -40,6 +45,7 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd /** * Tests putAll after with streamer batch load with one entity. */ + @Test public void testPuAllSingleEntity() { doStreamerBatchTest(50, 1_000, @@ -89,4 +95,4 @@ public class CacheOffheapBatchIndexingMultiTypeTest extends CacheOffheapBatchInd cache.destroy(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java index acf33dc..f07e041 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingSingleTypeTest.java @@ -27,17 +27,22 @@ import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.configuration.CacheConfiguration; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests various cache operations with indexing enabled. * Cache contains single type. */ +@RunWith(JUnit4.class) public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIndexingBaseTest { /** * Tests removal using EntryProcessor. * * @throws Exception If failed. */ + @Test public void testBatchRemove() throws Exception { Ignite ignite = grid(0); @@ -84,6 +89,7 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn /** * */ + @Test public void testPutAllAndStreamer() { doStreamerBatchTest(50, 1_000, @@ -94,6 +100,7 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn /** * */ + @Test public void testPuAllSingleEntity() { doStreamerBatchTest(50, 1_000, @@ -144,4 +151,4 @@ public class CacheOffheapBatchIndexingSingleTypeTest extends CacheOffheapBatchIn cache.destroy(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java index 6a04126..7167fcfd 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java @@ -36,6 +36,9 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; @@ -44,6 +47,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC /** * */ +@RunWith(JUnit4.class) public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { /** */ private static final int KEYS = 10_000; @@ -78,6 +82,7 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAtomicIndexEnabled() throws Exception { concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, true)); } @@ -85,6 +90,7 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testAtomic() throws Exception { concurrentPutGetRemoveExpireAndQuery(cacheConfiguration(ATOMIC, false)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java index 3bbb007..f496317 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java @@ -38,10 +38,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheQueryBuildValueTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -99,6 +103,7 @@ public class CacheQueryBuildValueTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testBuilderAndQuery() throws Exception { Ignite node = ignite(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java index 254b59c..99bb20b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java @@ -31,10 +31,14 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class CacheQueryEvictDataLostTest extends GridCommonAbstractTest { /** */ private static final int KEYS = 100_000; @@ -71,6 +75,7 @@ public class CacheQueryEvictDataLostTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueryDataLost() throws Exception { final long stopTime = U.currentTimeMillis() + 30_000; http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java index 47c87fa..6917313 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryFilterExpiredTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; /** * */ +@RunWith(JUnit4.class) public class CacheQueryFilterExpiredTest extends GridCommonAbstractTest { /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -55,6 +59,7 @@ public class CacheQueryFilterExpiredTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testFilterExpired() throws Exception { try (Ignite ignite = startGrid(0)) { checkFilterExpired(ignite, ATOMIC, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java index d330840..4aaa67b 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryNewClientSelfTest.java @@ -28,10 +28,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test for the case when client is started after the cache is already created. */ +@RunWith(JUnit4.class) public class CacheQueryNewClientSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -53,6 +57,7 @@ public class CacheQueryNewClientSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueryFromNewClient() throws Exception { Ignite srv = startGrid("server"); @@ -88,6 +93,7 @@ public class CacheQueryNewClientSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testQueryFromNewClientCustomSchemaName() throws Exception { Ignite srv = startGrid("server"); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java index c2f31f7..0662d50 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java @@ -46,6 +46,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.jetbrains.annotations.Nullable; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; @@ -55,6 +58,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -93,6 +97,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testAtomicOffheapEviction() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, ATOMIC, @@ -105,6 +110,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testAtomicOffheapEvictionIndexing() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, ATOMIC, @@ -117,6 +123,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testTxOffheapEviction() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, TRANSACTIONAL, @@ -129,6 +136,7 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe /** * @throws Exception If failed. */ + @Test public void testTxOffheapEvictionIndexing() throws Exception { CacheConfiguration<Object, Object> ccfg = cacheConfiguration(PARTITIONED, TRANSACTIONAL, http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java index 2e66b71..7265c2c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java @@ -60,10 +60,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests partition scan query fallback. */ +@RunWith(JUnit4.class) public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractTest { /** Grid count. */ private static final int GRID_CNT = 3; @@ -128,6 +132,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testScanLocal() throws Exception { cacheMode = CacheMode.PARTITIONED; backups = 0; @@ -155,6 +160,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testScanLocalExplicit() throws Exception { cacheMode = CacheMode.PARTITIONED; backups = 0; @@ -190,6 +196,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testScanLocalExplicitNoPart() throws Exception { cacheMode = CacheMode.PARTITIONED; backups = 0; @@ -215,6 +222,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testScanRemote() throws Exception { cacheMode = CacheMode.PARTITIONED; backups = 0; @@ -244,6 +252,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT /** * @throws Exception In case of error. */ + @Test public void testScanFallbackOnRebalancing() throws Exception { scanFallbackOnRebalancing(false); } @@ -341,6 +350,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT * * @throws Exception In case of error. */ + @Test public void testScanFallbackOnRebalancingCursor1() throws Exception { cacheMode = CacheMode.PARTITIONED; clientMode = false; @@ -408,6 +418,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT /** * @throws Exception If failed. */ + @Test public void testScanFallbackOnRebalancingCursor2() throws Exception { scanFallbackOnRebalancing(true); } @@ -577,4 +588,4 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT return new TcpCommunicationSpi(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java index 5b92726..5647d09 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java @@ -38,10 +38,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests modification of values returned by query iterators with enabled copy on read. */ +@RunWith(JUnit4.class) public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -98,6 +102,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testTwoStepSqlClientQuery() throws Exception { try (Ignite client = startGrid("client")) { IgniteCache<Integer, Value> cache = client.cache(DEFAULT_CACHE_NAME); @@ -128,6 +133,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** * Test two step query without local reduce phase. */ + @Test public void testTwoStepSkipReduceSqlQuery() { IgniteCache<Integer, Value> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -145,6 +151,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** * Test two step query value copy. */ + @Test public void testTwoStepReduceSqlQuery() { IgniteCache<Integer, Value> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -163,6 +170,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** * Tests local sql query. */ + @Test public void testLocalSqlQuery() { IgniteCache<Integer, Value> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -182,6 +190,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { /** * Tests local sql query. */ + @Test public void testLocalSqlFieldsQuery() { IgniteCache<Integer, Value> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -224,6 +233,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testRunningSqlFieldsQuery() throws Exception { IgniteInternalFuture<?> fut = runQueryAsync(new SqlFieldsQuery("select _val, sleep(1000) from Value limit 3")); @@ -264,6 +274,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testRunningSqlQuery() throws Exception { IgniteInternalFuture<?> fut = runQueryAsync(new SqlQuery<Integer, Value>(Value.class, "id > sleep(100)")); @@ -304,6 +315,7 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testCancelingSqlFieldsQuery() throws Exception { runQueryAsync(new SqlFieldsQuery("select * from (select _val, sleep(100) from Value limit 50)")); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java index 9012161..ff1cc82 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java @@ -39,9 +39,13 @@ import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.lang.IgnitePredicate; 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; /** */ +@RunWith(JUnit4.class) public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTest { /** Server id. */ private static final int SERVER_ID = 0; @@ -113,6 +117,7 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe } /** */ + @Test public void testReconnectClient() throws Exception { try { startGrid(SERVER_ID); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeSqlTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeSqlTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeSqlTest.java index d431f73..9a91fe2 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeSqlTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClusterReadOnlyModeSqlTest.java @@ -24,14 +24,19 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.query.FieldsQueryCursor; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.internal.util.typedef.G; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests SQL queries in read-only cluster mode. */ +@RunWith(JUnit4.class) public class ClusterReadOnlyModeSqlTest extends ClusterReadOnlyModeAbstractTest { /** * */ + @Test public void testSqlReadOnly() { assertSqlReadOnlyMode(false); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionSelfTest.java index 6652559..97c9696 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/DdlTransactionSelfTest.java @@ -34,10 +34,14 @@ import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import org.apache.ignite.transactions.TransactionState; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -84,6 +88,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxIsCommittedOnDdlRequestMultinodeClient() throws Exception { startGridsMultiThreaded(4, false); @@ -132,6 +137,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxIsCommittedOnDdlRequestMultinode() throws Exception { Ignite node = startGridsMultiThreaded(4); @@ -174,6 +180,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTxIsCommittedOnDdlRequest() throws Exception { Ignite node = startGrid(); @@ -216,6 +223,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDdlRequestWithoutTxMultinodeClient() throws Exception { startGridsMultiThreaded(4, false); @@ -260,6 +268,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDdlRequestWithoutTxMultinode() throws Exception { Ignite node = startGridsMultiThreaded(4); @@ -298,6 +307,7 @@ public class DdlTransactionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testDdlRequestWithoutTx() throws Exception { Ignite node = startGrid(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index cf8bb2e..098bf65 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@ -45,6 +45,9 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; @@ -52,6 +55,7 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; /** * Tests cross cache queries. */ +@RunWith(JUnit4.class) public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** */ private static final String PART_CACHE_NAME = "partitioned"; @@ -128,6 +132,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testTwoStepGroupAndAggregates() throws Exception { IgniteInternalCache<Integer, FactPurchase> cache = ((IgniteKernal)ignite).getCache(PART_CACHE_NAME); @@ -228,6 +233,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testApiQueries() throws Exception { IgniteCache<Object,Object> c = ignite.cache(PART_CACHE_NAME); @@ -243,6 +249,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testMultiStatement() throws Exception { final IgniteInternalCache<Integer, FactPurchase> cache = ((IgniteKernal)ignite).getCache(PART_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java index 14ad39a..7027de6 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java @@ -47,6 +47,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -54,6 +57,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * FullTest queries left test. */ +@RunWith(JUnit4.class) public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** Cache size. */ private static final int MAX_ITEM_COUNT = 100; @@ -102,6 +106,7 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception In case of error. */ + @Test public void testTextQueryWithField() throws Exception { checkTextQuery("name:1*", false, false); } @@ -109,6 +114,7 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception In case of error. */ + @Test public void testLocalTextQueryWithKeepBinary() throws Exception { checkTextQuery(true, true); } @@ -116,6 +122,7 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception In case of error. */ + @Test public void testLocalTextQuery() throws Exception { checkTextQuery(true, false); } @@ -123,6 +130,7 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception In case of error. */ + @Test public void testTextQueryWithKeepBinary() throws Exception { checkTextQuery(false, true); } @@ -130,6 +138,7 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { /** * @throws Exception In case of error. */ + @Test public void testTextQuery() throws Exception { checkTextQuery(false, true); } @@ -371,4 +380,4 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest { birthday = cal.getTime(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLazyQueryPartitionsReleaseTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLazyQueryPartitionsReleaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLazyQueryPartitionsReleaseTest.java index a112969..fd2d9ed 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLazyQueryPartitionsReleaseTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLazyQueryPartitionsReleaseTest.java @@ -38,10 +38,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Test to lazy query partitions has not been released too early. */ +@RunWith(JUnit4.class) public class GridCacheLazyQueryPartitionsReleaseTest extends GridCommonAbstractTest { /** IP finder */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -84,6 +88,7 @@ public class GridCacheLazyQueryPartitionsReleaseTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testLazyQueryPartitionsRelease() throws Exception { Ignite node1 = startGrid(0); @@ -131,6 +136,7 @@ public class GridCacheLazyQueryPartitionsReleaseTest extends GridCommonAbstractT * * @throws Exception If failed. */ + @Test public void testLazyQueryPartitionsReleaseOnClose() throws Exception { Ignite node1 = startGrid(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index e06f6a6..f39c916 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -30,6 +30,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.REPLICATED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -38,6 +41,7 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * Test for cache swap. */ +@RunWith(JUnit4.class) public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { /** Saved versions. */ private final Map<Integer, Object> versions = new HashMap<>(); @@ -78,6 +82,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testOffHeapIterator() throws Exception { try { startGrids(1); @@ -142,4 +147,4 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { return S.toString(CacheValue.class, this); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java index e14da4a..5614c2e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java @@ -33,6 +33,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -41,6 +44,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * */ +@RunWith(JUnit4.class) public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest { /** */ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -80,6 +84,7 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testQueryWhenLocked() throws Exception { IgniteCache<Integer, TestValue> cache = grid(0).cache(DEFAULT_CACHE_NAME); @@ -112,6 +117,7 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testUpdates() throws Exception { final int ENTRIES = 500; @@ -189,4 +195,4 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest val = in.readInt(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java index 321a201..ae83d0c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java @@ -36,6 +36,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -45,6 +48,7 @@ import static org.apache.ignite.configuration.DeploymentMode.SHARED; /** * Tests off heap storage when both offheaped and swapped entries exists. */ +@RunWith(JUnit4.class) public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { /** */ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -100,6 +104,7 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { * * @throws Exception If failed. */ + @Test public void testGet() throws Exception { IgniteCache<Long, Long> cache = jcache(grid(0), cacheConfiguration(), Long.class, Long.class); @@ -124,6 +129,7 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPutGet() throws Exception { IgniteCache<Object, Object> cache = jcache(grid(0), cacheConfiguration(), Object.class, Object.class); @@ -151,6 +157,7 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testWithExpiryPolicy() throws Exception { IgniteCache<Long, Long> cache = jcache(grid(0), cacheConfiguration(), Long.class, Long.class); @@ -223,4 +230,4 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest { this.val = val; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java index 14b1f67..4fb3202 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexDisabledSelfTest.java @@ -34,9 +34,13 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** */ +@RunWith(JUnit4.class) public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -68,6 +72,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testSqlQuery() throws Exception { IgniteCache<Integer, SqlValue> cache = grid().getOrCreateCache(SqlValue.class.getSimpleName()); @@ -87,6 +92,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testSqlFieldsQuery() throws Exception { IgniteCache<Integer, SqlValue> cache = grid().getOrCreateCache(SqlValue.class.getSimpleName()); @@ -118,6 +124,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testFullTextQuery() throws Exception { IgniteCache<Integer, String> cache = grid().getOrCreateCache(String.class.getSimpleName()); @@ -137,6 +144,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testScanLocalQuery() throws Exception { IgniteCache<Integer, String> cache = grid().getOrCreateCache(String.class.getSimpleName()); @@ -154,6 +162,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testSqlLocalQuery() throws Exception { IgniteCache<Integer, SqlValue> cache = grid().getOrCreateCache(SqlValue.class.getSimpleName()); @@ -173,6 +182,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testSqlLocalFieldsQuery() throws Exception { IgniteCache<Integer, SqlValue> cache = grid().getOrCreateCache(SqlValue.class.getSimpleName()); @@ -192,6 +202,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testFullTextLocalQuery() throws Exception { IgniteCache<Integer, String> cache = grid().getOrCreateCache(String.class.getSimpleName()); @@ -211,6 +222,7 @@ public class GridCacheQueryIndexDisabledSelfTest extends GridCommonAbstractTest /** * @throws Exception If failed. */ + @Test public void testScanQuery() throws Exception { IgniteCache<Integer, String> cache = grid().getOrCreateCache(String.class.getSimpleName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java index 85fd6db..c19e185 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java @@ -32,6 +32,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; /** * Tests for cache query results serialization. */ +@RunWith(JUnit4.class) public class GridCacheQuerySerializationSelfTest extends GridCommonAbstractTest { /** */ private static final int GRID_CNT = 2; @@ -102,6 +106,7 @@ public class GridCacheQuerySerializationSelfTest extends GridCommonAbstractTest * * @throws Exception In case of error. */ + @Test public void testSerialization() throws Exception { IgniteEx g0 = grid(0); @@ -142,4 +147,4 @@ public class GridCacheQuerySerializationSelfTest extends GridCommonAbstractTest return c.query(sql.setSql(sqlStr)).getAll(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java index fb20b41..485c9bd 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySimpleBenchmark.java @@ -40,10 +40,14 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * */ +@RunWith(JUnit4.class) public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -95,6 +99,7 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + @Test public void testPerformance() throws Exception { Random rnd = new GridRandom(); @@ -211,4 +216,4 @@ public class GridCacheQuerySimpleBenchmark extends GridCommonAbstractTest { name = U.readString(in); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 570a1b0..f181cf8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -31,6 +31,9 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -39,6 +42,7 @@ import static org.apache.ignite.cache.CacheRebalanceMode.SYNC; /** * GG-4368 */ +@RunWith(JUnit4.class) public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { /** */ private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); @@ -92,6 +96,7 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { } /** @throws Exception If failed. */ + @Test public void testQuery() throws Exception { IgniteCache<Integer, ObjectValue> cache = ignite.cache(DEFAULT_CACHE_NAME); @@ -111,4 +116,4 @@ public class GridIndexingWithNoopSwapSelfTest extends GridCommonAbstractTest { assertEquals(10, cache.query(qry.setArgs(0)).getAll().size()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/c5197e0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java index 21e4852..565cb27 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java @@ -37,10 +37,14 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * Tests that server nodes do not need class definitions to execute queries. */ +@RunWith(JUnit4.class) public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTest { /** */ public static final String PERSON_KEY_CLS_NAME = "org.apache.ignite.tests.p2p.cache.PersonKey"; @@ -121,6 +125,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testQueryPartitionedAtomic() throws Exception { checkQuery(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC); } @@ -128,6 +133,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testQueryReplicatedAtomic() throws Exception { checkQuery(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC); } @@ -135,6 +141,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testQueryPartitionedTransactional() throws Exception { checkQuery(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL); } @@ -142,6 +149,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testQueryReplicatedTransactional() throws Exception { checkQuery(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL); } @@ -149,6 +157,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testFieldsQueryPartitionedAtomic() throws Exception { checkFieldsQuery(CacheMode.PARTITIONED, CacheAtomicityMode.ATOMIC); } @@ -156,6 +165,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testFieldsQueryReplicatedAtomic() throws Exception { checkFieldsQuery(CacheMode.REPLICATED, CacheAtomicityMode.ATOMIC); } @@ -163,6 +173,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testFieldsQueryPartitionedTransactional() throws Exception { checkFieldsQuery(CacheMode.PARTITIONED, CacheAtomicityMode.TRANSACTIONAL); } @@ -170,6 +181,7 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes /** * @throws Exception If failed. */ + @Test public void testFieldsQueryReplicatedTransactional() throws Exception { checkFieldsQuery(CacheMode.REPLICATED, CacheAtomicityMode.TRANSACTIONAL); }
