Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_3 33459b196 -> 24bb2959a
# ignite-709_3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24bb2959 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24bb2959 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24bb2959 Branch: refs/heads/ignite-709_3 Commit: 24bb2959a67201e5be9d5d01467a1d5731daf886 Parents: 33459b1 Author: sboikov <[email protected]> Authored: Fri May 15 17:45:53 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri May 15 17:47:02 2015 +0300 ---------------------------------------------------------------------- .../internal/GridProjectionForCachesSelfTest.java | 11 ++++++++--- .../discovery/GridDiscoveryManagerSelfTest.java | 13 +++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24bb2959/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java index 0a961d4..04cd3f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java @@ -52,9 +52,14 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoverySpi()); - cfg.setCacheConfiguration( - cacheConfiguration(null, new AttributeFilter(getTestGridName(0)), false), - cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestGridName(2), getTestGridName(3)), true)); + List<CacheConfiguration> ccfgs = new ArrayList<>(); + + if (gridName.equals(getTestGridName(0))) + ccfgs.add(cacheConfiguration(null, new AttributeFilter(getTestGridName(0)), false)); + else if (gridName.equals(getTestGridName(2)) || gridName.equals(getTestGridName(3))) + ccfgs.add(cacheConfiguration(CACHE_NAME, new AttributeFilter(getTestGridName(2), getTestGridName(3)), true)); + + cfg.setCacheConfiguration(ccfgs.toArray(new CacheConfiguration[ccfgs.size()])); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24bb2959/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java index 6f7c935..be5b9c6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerSelfTest.java @@ -66,14 +66,15 @@ public class GridDiscoveryManagerSelfTest extends GridCommonAbstractTest { if (gridName.equals(getTestGridName(1))) cfg.setClientMode(true); + else { + ccfg1.setNearConfiguration(null); + ccfg2.setNearConfiguration(null); - ccfg1.setNearConfiguration(null); - ccfg2.setNearConfiguration(null); + ccfg1.setCacheMode(PARTITIONED); + ccfg2.setCacheMode(PARTITIONED); - ccfg1.setCacheMode(PARTITIONED); - ccfg2.setCacheMode(PARTITIONED); - - cfg.setCacheConfiguration(ccfg1, ccfg2); + cfg.setCacheConfiguration(ccfg1, ccfg2); + } return cfg; }
