[ignite] 01/02: ignite-11704

[sboikov]

This is an automated email from the ASF dual-hosted git repository.

sboikov pushed a commit to branch ignite-11704
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit 4403455baaa82b5c2546802633cbe1a676393513
Author: sboikov <sboi...@apache.org>
AuthorDate: Wed Jul 10 22:38:35 2019 +0300

    ignite-11704
---
 .../processors/cache/IgniteCacheConfigVariationsFullApiTest.java  | 2 +-
 .../cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
index 74d9442..ae9df1e 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java
@@ -6616,7 +6616,7 @@ public class IgniteCacheConfigVariationsFullApiTest 
extends IgniteCacheConfigVar
 
                 GridCacheEntryEx entry = ctx.isNear() ? 
ctx.near().dht().peekEx(key) : ctx.cache().peekEx(key);
 
-                if 
(ignite.affinity(cacheName).mapKeyToPrimaryAndBackups(key).contains(((IgniteKernal)ignite).localNode()))
 {
+                if (ctx.deferredDelete() && 
ignite.affinity(cacheName).mapKeyToPrimaryAndBackups(key).contains(((IgniteKernal)ignite).localNode()))
 {
                     assertNotNull(entry);
                     assertTrue(entry.deleted());
                 }
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
index 53556bd..68c8f7a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
@@ -48,7 +48,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends 
GridCommonAbstractTest
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
         cfg.setCacheConfiguration(
-            new CacheConfiguration()
+            new CacheConfiguration(DEFAULT_CACHE_NAME)
                 .setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
                 .setBackups(1)
                 
.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC)
@@ -96,14 +96,14 @@ public class IgnitePdsRemoveDuringRebalancingTest extends 
GridCommonAbstractTest
 
         ig.active(true);
 
-        try (IgniteDataStreamer<Object, Object> streamer = 
ig.dataStreamer(null)) {
+        try (IgniteDataStreamer<Object, Object> streamer = 
ig.dataStreamer(DEFAULT_CACHE_NAME)) {
             streamer.allowOverwrite(true);
 
             for (int i = 0; i < 100_000; i++)
                 streamer.addData(i, i);
         }
 
-        final IgniteCache<Object, Object> cache = ig.cache(null);
+        final IgniteCache<Object, Object> cache = ig.cache(DEFAULT_CACHE_NAME);
 
         IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new 
Callable<Object>() {
             @Override public Object call() throws Exception {
@@ -118,7 +118,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends 
GridCommonAbstractTest
 
         IgniteEx another = grid(1);
 
-        IgniteCache<Object, Object> cache1 = another.cache(null);
+        IgniteCache<Object, Object> cache1 = another.cache(DEFAULT_CACHE_NAME);
 
         for (int i = 0; i < 100_000; i++)
             assertNull(cache1.localPeek(i));