Repository: ignite Updated Branches: refs/heads/ignite-3004 3812a4b2c -> c04c38711
IGNITE-3004 WIP. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c04c3871 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c04c3871 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c04c3871 Branch: refs/heads/ignite-3004 Commit: c04c3871179a449e9c9f8ee2e7141a939064e6de Parents: 3812a4b Author: nikolay_tikhonov <[email protected]> Authored: Fri Apr 22 12:25:25 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Fri Apr 22 12:25:25 2016 +0300 ---------------------------------------------------------------------- .../CacheContinuousQueryVariationsTest.java | 23 +++++++++++++++----- .../IgniteConfigVariationsAbstractTest.java | 2 +- .../IgniteContinuousQueryVarSuite.java | 2 -- 3 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c04c3871/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java index 2cf3484..0f2a185 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryVariationsTest.java @@ -51,6 +51,7 @@ import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.PA; @@ -87,6 +88,15 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati /** */ private static final int VALS = 10; + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setClientMode(gridName.endsWith("0")); + + return cfg; + } + /** * @throws Exception If failed. */ @@ -245,12 +255,13 @@ public class CacheContinuousQueryVariationsTest extends IgniteCacheConfigVariati if (i % 5 == 0) log.info("Iteration: " + i); - randomUpdate(rnd, - evtsQueues, - expData, - keepBinary ? jcache().withKeepBinary() : jcache(), - keepBinary, - withFilter); + for (int idx = 0; idx < G.allGrids().size(); idx++) + randomUpdate(rnd, + evtsQueues, + expData, + keepBinary ? jcache(idx).withKeepBinary() : jcache(idx), + keepBinary, + withFilter); } } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/c04c3871/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java index 9427d54..1734fdb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java @@ -146,7 +146,7 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr } /** {@inheritDoc} */ - @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception { + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); IgniteConfiguration resCfg = testsCfg.configurationFactory().getConfiguration(gridName, cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/c04c3871/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousQueryVarSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousQueryVarSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousQueryVarSuite.java index fd7f72b..8d04a8a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousQueryVarSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteContinuousQueryVarSuite.java @@ -40,8 +40,6 @@ public class IgniteContinuousQueryVarSuite extends TestSuite { .withBasicCacheParams() .gridsCount(3) .backups(1) - .testedNodesCount(2) - .withClients() .build(); } }
