Repository: ignite Updated Branches: refs/heads/master 3307a8b26 -> 2bf48e541
IGNITE-9302 Added timeouts for Java Thin Clients tests - Fixes #4562. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2bf48e54 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2bf48e54 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2bf48e54 Branch: refs/heads/master Commit: 2bf48e5417816c2211402dfacf5678f6a67014bd Parents: 3307a8b Author: EdShangGG <eshangar...@gridgain.com> Authored: Thu Aug 30 16:47:23 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Aug 30 16:47:23 2018 +0300 ---------------------------------------------------------------------- .../ignite/client/ClientCacheConfigurationTest.java | 7 +++++++ .../apache/ignite/client/ClientConfigurationTest.java | 7 +++++++ .../java/org/apache/ignite/client/FunctionalTest.java | 7 +++++++ .../java/org/apache/ignite/client/IgniteBinaryTest.java | 11 +++++++---- .../test/java/org/apache/ignite/client/LoadTest.java | 10 +++++++--- .../java/org/apache/ignite/client/ReliabilityTest.java | 12 +++++++----- .../cluster/FullyConnectedComponentSearcherTest.java | 7 +++++++ .../cache/persistence/pagemem/FullPageIdTableTest.java | 7 +++++++ .../IgnitePageMemReplaceDelayedWriteUnitTest.java | 7 +++++++ .../persistence/pagemem/IgniteThrottlingUnitTest.java | 7 +++++++ .../pagemem/RobinHoodBackwardShiftHashMapTest.java | 6 ++++++ .../org/apache/ignite/testframework/GridTestUtils.java | 3 +++ .../ignite/testframework/junits/GridAbstractTest.java | 5 +---- .../org/apache/ignite/client/FunctionalQueryTest.java | 7 +++++++ .../org/apache/ignite/client/IgniteBinaryQueryTest.java | 7 +++++++ .../java/org/apache/ignite/client/SecurityTest.java | 7 +++++++ .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 6 ++++++ 17 files changed, 107 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/ClientCacheConfigurationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/ClientCacheConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/client/ClientCacheConfigurationTest.java index 0c82b26..350c0dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/ClientCacheConfigurationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/ClientCacheConfigurationTest.java @@ -38,7 +38,10 @@ import org.apache.ignite.cache.PartitionLossPolicy; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertTrue; @@ -46,6 +49,10 @@ import static org.junit.Assert.assertTrue; * {@link ClientConfiguration} unit tests. */ public class ClientCacheConfigurationTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** Serialization/deserialization. */ @Test public void testSerialization() throws IOException, ClassNotFoundException { http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java index e6ab4d7..bcc212a 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/ClientConfigurationTest.java @@ -27,7 +27,10 @@ import java.io.ObjectOutputStream; import java.util.Collections; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertTrue; @@ -35,6 +38,10 @@ import static org.junit.Assert.assertTrue; * {@link ClientConfiguration} unit tests. */ public class ClientConfigurationTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** Serialization/deserialization. */ @Test public void testSerialization() throws IOException, ClassNotFoundException { http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java b/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java index b49f7e3..1272287 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/FunctionalTest.java @@ -40,7 +40,10 @@ import org.apache.ignite.cache.PartitionLossPolicy; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -54,6 +57,10 @@ import static org.junit.Assert.fail; * Thin client functional tests. */ public class FunctionalTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Tested API: * <ul> http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java index b9402cc..0f84c75 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/IgniteBinaryTest.java @@ -26,12 +26,11 @@ import org.apache.ignite.IgniteBinary; import org.apache.ignite.Ignition; import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.client.ClientCache; -import org.apache.ignite.client.Config; -import org.apache.ignite.client.IgniteClient; -import org.apache.ignite.client.Person; import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -40,6 +39,10 @@ import static org.junit.Assert.assertEquals; * Ignite {@link BinaryObject} API system tests. */ public class IgniteBinaryTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Unmarshalling schema-less Ignite binary objects into Java static types. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java b/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java index 63bcf57..f97e7b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/LoadTest.java @@ -39,10 +39,10 @@ import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.client.ClientCache; -import org.apache.ignite.client.Config; -import org.apache.ignite.client.IgniteClient; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -52,6 +52,10 @@ import static org.junit.Assert.assertTrue; * Load, capacity and performance tests. */ public class LoadTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Test thin client in multi-thread environment. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java index 147f371..f019fd9 100644 --- a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java +++ b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java @@ -34,14 +34,12 @@ import org.apache.ignite.cache.query.Query; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.ScanQuery; import org.apache.ignite.internal.processors.platform.client.ClientStatus; -import org.apache.ignite.client.ClientCache; -import org.apache.ignite.client.ClientCacheConfiguration; -import org.apache.ignite.client.IgniteClient; import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.internal.client.thin.ClientServerError; -import org.apache.ignite.client.ClientConnectionException; -import org.apache.ignite.client.LocalIgniteCluster; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -51,6 +49,10 @@ import static org.junit.Assert.assertTrue; * High Availability tests. */ public class ReliabilityTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Thin clint failover. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java b/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java index d6680cf..7042da0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/cluster/FullyConnectedComponentSearcherTest.java @@ -23,9 +23,12 @@ import java.util.Collection; import java.util.Random; import org.apache.ignite.internal.cluster.graph.FullyConnectedComponentSearcher; import org.apache.ignite.internal.util.typedef.internal.A; +import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.NotNull; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -34,6 +37,10 @@ import org.junit.runners.Parameterized; */ @RunWith(Parameterized.class) public class FullyConnectedComponentSearcherTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** Adjacency matrix provider for each test. */ private AdjacencyMatrixProvider provider; http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java index 43b27aa..e337bb1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FullPageIdTableTest.java @@ -26,7 +26,10 @@ import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider; import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.logger.java.JavaLogger; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; @@ -34,6 +37,10 @@ import static org.junit.Assert.assertEquals; * */ public class FullPageIdTableTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** */ private static final int CACHE_ID_RANGE = 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java index c6f42e1..aa1e37d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgnitePageMemReplaceDelayedWriteUnitTest.java @@ -42,8 +42,11 @@ import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDataba import org.apache.ignite.internal.util.GridMultiCollectionWrapper; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.logger.NullLogger; +import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.NotNull; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import org.mockito.Mockito; import static org.mockito.Matchers.any; @@ -54,6 +57,10 @@ import static org.mockito.Mockito.when; * Unit test for delayed page replacement mode. */ public class IgnitePageMemReplaceDelayedWriteUnitTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** CPU count. */ private static final int CPUS = 32; http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java index f9ca7e4..6f504da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/IgniteThrottlingUnitTest.java @@ -24,7 +24,10 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.processors.cache.persistence.CheckpointLockStateChecker; import org.apache.ignite.internal.processors.cache.persistence.CheckpointWriteProgressSupplier; import org.apache.ignite.logger.NullLogger; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -37,6 +40,10 @@ import static org.mockito.Mockito.when; * */ public class IgniteThrottlingUnitTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** Logger. */ private IgniteLogger log = new NullLogger(); http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java index 565b99e..345651e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/RobinHoodBackwardShiftHashMapTest.java @@ -26,8 +26,11 @@ import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.util.GridLongList; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.NotNull; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.apache.ignite.IgniteSystemProperties.IGNITE_LONG_LONG_HASH_MAP_LOAD_FACTOR; import static org.junit.Assert.assertEquals; @@ -38,6 +41,9 @@ import static org.junit.Assert.assertTrue; * Unit tests of {@link RobinHoodBackwardShiftHashMap} implementation. */ public class RobinHoodBackwardShiftHashMapTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); /** * @param tester map test code http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index cb3d8f2..c6d9527 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -115,6 +115,9 @@ public final class GridTestUtils { public static final long DFLT_BUSYWAIT_SLEEP_INTERVAL = 200; /** */ + public static final long DFLT_TEST_TIMEOUT = 5 * 60 * 1000; + + /** */ static final String ALPHABETH = "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM1234567890_"; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 09475e6..a1d6c25 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -160,9 +160,6 @@ public abstract class GridAbstractTest extends TestCase { }}; /** */ - private static final long DFLT_TEST_TIMEOUT = 5 * 60 * 1000; - - /** */ private static final int DFLT_TOP_WAIT_TIMEOUT = 2000; /** */ @@ -2183,7 +2180,7 @@ public abstract class GridAbstractTest extends TestCase { if (timeout != null) return Long.parseLong(timeout); - return DFLT_TEST_TIMEOUT; + return GridTestUtils.DFLT_TEST_TIMEOUT; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java index eeec30f..d10ed1a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/client/FunctionalQueryTest.java @@ -36,7 +36,10 @@ import org.apache.ignite.cache.query.SqlQuery; import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.ClientConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.*; @@ -44,6 +47,10 @@ import static org.junit.Assert.*; * Thin client functional tests. */ public class FunctionalQueryTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Tested API: * <ul> http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/indexing/src/test/java/org/apache/ignite/client/IgniteBinaryQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/client/IgniteBinaryQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/client/IgniteBinaryQueryTest.java index 4b3eebc..a524394 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/client/IgniteBinaryQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/client/IgniteBinaryQueryTest.java @@ -38,7 +38,10 @@ import org.apache.ignite.client.ClientCacheConfiguration; import org.apache.ignite.client.Config; import org.apache.ignite.client.IgniteClient; import org.apache.ignite.configuration.ClientConfiguration; +import org.apache.ignite.testframework.GridTestUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; @@ -46,6 +49,10 @@ import static org.junit.Assert.assertEquals; * Ignite {@link BinaryObject} API system tests. */ public class IgniteBinaryQueryTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** * Test queries in Ignite binary. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java b/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java index e2b11db..0be13db 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/client/SecurityTest.java @@ -31,8 +31,11 @@ import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.ssl.SslContextFactory; +import org.apache.ignite.testframework.GridTestUtils; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -41,6 +44,10 @@ import static org.junit.Assert.assertTrue; * Thin client security test. */ public class SecurityTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** Ignite home. */ private static final String IGNITE_HOME = U.getIgniteHome(); http://git-wip-us.apache.org/repos/asf/ignite/blob/2bf48e54/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java index 25598fe..f85c6a3c 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/zk/ZookeeperIpFinderTest.java @@ -36,6 +36,8 @@ import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Rule; +import org.junit.rules.Timeout; /** * Test for {@link TcpDiscoveryZookeeperIpFinder}. @@ -43,6 +45,10 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; * @author Raul Kripalani */ public class ZookeeperIpFinderTest extends GridCommonAbstractTest { + /** Per test timeout */ + @Rule + public Timeout globalTimeout = new Timeout((int) GridTestUtils.DFLT_TEST_TIMEOUT); + /** ZK Cluster size. */ private static final int ZK_CLUSTER_SIZE = 3;
