sp-1 fixing tests

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java

@@ -3122,8 +3122,13 @@ private void checkTtl(boolean inTx, boolean oldEntry) throws Exception {
             @SuppressWarnings("unchecked")
             @Override public boolean applyx() throws IgniteCheckedException {
                 try {
-                    if (c.get(key) != null)
+                    Integer val = c.get(key);
+
+                    if (val != null) {
+                        info("Value is in cache [key=" + key + ", val=" + val + ']');
+
                         return false;
+                    }
 
                     // Get "cache" field from GridCacheProxyImpl.
                     GridCacheAdapter c0 = GridTestUtils.getFieldValue(c, "cache");
@@ -3687,11 +3692,9 @@ public void testIgniteCacheIterator() throws Exception {
 
         assertFalse(cache.iterator().hasNext());
 
-        final int SIZE = 20000;
-
         Map<String, Integer> entries = new HashMap<>();
 
-        for (int i = 0; i < SIZE; ++i) {
+        for (int i = 0; i < 20000; ++i) {
             cache.put(Integer.toString(i), i);
 
             entries.put(Integer.toString(i), i);

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java

@@ -17,24 +17,22 @@
 
 package org.apache.ignite.internal.processors.cache.distributed.near;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.affinity.*;
 import org.apache.ignite.cluster.*;
-import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
-import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.lang.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CachePreloadMode.*;
-import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 
 /**
  * Multi-node tests for partitioned cache.
@@ -75,8 +73,8 @@ public void testPutAllRemoveAll() throws Exception {
         for (int i = 0; i < size; i++)
             putMap.put(i, i * i);
 
-        GridCache<Object, Object> prj0 = grid(0).cache(null);
-        GridCache<Object, Object> prj1 = grid(1).cache(null);
+        IgniteCache<Object, Object> prj0 = grid(0).jcache(null);
+        IgniteCache<Object, Object> prj1 = grid(1).jcache(null);
 
         prj0.putAll(putMap);