fixing db tests after 2.0 merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/44f276aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/44f276aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/44f276aa Branch: refs/heads/ignite-5075-pds Commit: 44f276aa50945271d8a1f7d65d04df954ded04ef Parents: 601722a Author: Eduard Shangareev <[email protected]> Authored: Wed May 17 14:49:05 2017 +0300 Committer: Eduard Shangareev <[email protected]> Committed: Wed May 17 14:49:05 2017 +0300 ---------------------------------------------------------------------- .../database/IgniteDbDynamicCacheSelfTest.java | 1 - .../database/IgniteDbPutGetAbstractTest.java | 27 ++++++++++---------- 2 files changed, 13 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/44f276aa/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java index 3b3e1de..20cdc2a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java @@ -44,7 +44,6 @@ public class IgniteDbDynamicCacheSelfTest extends GridCommonAbstractTest { MemoryPolicyConfiguration plc = new MemoryPolicyConfiguration(); plc.setName("dfltPlc"); - plc.setMaxSize(200 * 1024 * 1024); dbCfg.setDefaultMemoryPolicyName("dfltPlc"); dbCfg.setMemoryPolicies(plc); http://git-wip-us.apache.org/repos/asf/ignite/blob/44f276aa/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java index f085ebb..0b0c763 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetAbstractTest.java @@ -57,9 +57,8 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @return Ignite instance for testing. */ private IgniteEx ig() { - if (withClientNearCache()) { + if (withClientNearCache()) return grid(gridCount()); - } return grid(0); } @@ -79,7 +78,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * */ public void testGradualRandomPutAllRemoveAll() throws Exception { - IgniteCache<Integer, DbValue> cache = cache(null); + IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); final int cnt = KEYS_COUNT; @@ -206,7 +205,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetSimple() throws Exception { - IgniteCache<Integer, DbValue> cache = cache(null); + IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -320,7 +319,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetOverwrite() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -348,7 +347,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testOverwriteNormalSizeAfterSmallerSize() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -383,7 +382,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetMultipleObjects() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -456,7 +455,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testSizeClear() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -614,7 +613,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetRandomUniqueMultipleObjects() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -681,7 +680,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception If failed. */ public void testPutPrimaryUniqueSecondaryDuplicates() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -725,7 +724,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetRandomNonUniqueMultipleObjects() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -771,7 +770,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testPutGetRemoveMultipleForward() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -861,7 +860,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { } public void testPutGetRemoveMultipleBackward() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache); @@ -905,7 +904,7 @@ public abstract class IgniteDbPutGetAbstractTest extends IgniteDbAbstractTest { * @throws Exception if failed. */ public void testIndexOverwrite() throws Exception { - final IgniteCache<Integer, DbValue> cache = cache(null); + final IgniteCache<Integer, DbValue> cache = cache(DEFAULT_CACHE_NAME); GridCacheAdapter<Integer, DbValue> internalCache = internalCache(cache);
