IGNITE-59 Support lock, lockAll: Fix tests.

modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java

@@ -49,10 +49,10 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
     private static Ignite ignite2;
 
     /** (for convenience). */
-    private static GridCache<Integer, String> cache1;
+    private static IgniteCache<Integer, String> cache1;
 
     /** (for convenience). */
-    private static GridCache<Integer, String> cache2;
+    private static IgniteCache<Integer, String> cache2;
 
     /** Ip-finder. */
     private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
@@ -104,8 +104,8 @@ protected GridCacheConfiguration cacheConfiguration() {
         ignite1 = startGrid(1);
         ignite2 = startGrid(2);
 
-        cache1 = ignite1.cache(null);
-        cache2 = ignite2.cache(null);
+        cache1 = ignite1.jcache(null);
+        cache2 = ignite2.jcache(null);
     }
 
     /** {@inheritDoc} */
@@ -127,8 +127,8 @@ protected GridCacheConfiguration cacheConfiguration() {
 
         cache2.flagsOn(GridCacheFlag.SYNC_COMMIT).removeAll();
 
-        assert cache1.isEmpty() : "Cache is not empty: " + cache1.entrySet();
-        assert cache2.isEmpty() : "Cache is not empty: " + cache2.entrySet();
+        assert cache1.size() == 0 : "Cache is not empty: " + cache1;
+        assert cache2.size() == 0 : "Cache is not empty: " + cache2;
     }
 
     /**
@@ -172,9 +172,6 @@ private boolean locked(Iterable<Integer> keys, int idx) {
      */
     @SuppressWarnings({"TooBroadScope"})
     public void testLockSingleThread() throws Exception {
-        final IgniteCache<Integer, String> cache1 = ignite1.jcache(null);
-        final IgniteCache<Integer, String> cache2 = ignite1.jcache(null);
-
         int k = 1;
         String v = String.valueOf(k);
 
@@ -208,9 +205,6 @@ public void testLockSingleThread() throws Exception {
      */
     @SuppressWarnings({"TooBroadScope"})
     public void testLock() throws Exception {
-        final IgniteCache<Integer, String> cache1 = ignite1.jcache(null);
-        final IgniteCache<Integer, String> cache2 = ignite1.jcache(null);
-
         final int kv = 1;
 
         final CountDownLatch l1 = new CountDownLatch(1);
@@ -299,9 +293,6 @@ public void testLock() throws Exception {
      * @throws Exception If test failed.
      */
     public void testLockAndPut() throws Exception {
-        final IgniteCache<Integer, String> cache1 = ignite1.jcache(null);
-        final IgniteCache<Integer, String> cache2 = ignite1.jcache(null);
-
         final CountDownLatch l1 = new CountDownLatch(1);
         final CountDownLatch l2 = new CountDownLatch(1);
 
@@ -388,7 +379,7 @@ public void testLockAndPut() throws Exception {
     public void testLockTimeoutTwoThreads() throws Exception {
         int keyCnt = 1;
 
-        final Collection<Integer> keys = new ArrayList<>(keyCnt);
+        final Set<Integer> keys = new HashSet<>();
 
         for (int i = 1; i <= keyCnt; i++)
             keys.add(i);
@@ -400,7 +391,7 @@ public void testLockTimeoutTwoThreads() throws Exception {
                 @Nullable @Override public Object call() throws Exception {
                     info("Before lock for keys.");
 
-                    assert cache1.lockAll(keys, 0);
+                    cache1.lockAll(keys).lock();
 
                     info("After lock for keys.");
 
@@ -428,7 +419,7 @@ public void testLockTimeoutTwoThreads() throws Exception {
 
                         info("Before unlock keys in thread 1: " + keys);
 
-                        cache1.unlockAll(keys);
+                        cache1.lockAll(keys).unlock();
 
                         info("Unlocked entry for keys.");
                     }
@@ -448,11 +439,11 @@ public void testLockTimeoutTwoThreads() throws Exception {
 
                         // This call should not acquire the lock since
                         // other thread is holding it.
-                        assert !cache1.lockAll(keys, -1);
+                        assert !cache1.lockAll(keys).tryLock();
 
                         info("Before unlock keys in thread 2: " + keys);
 
-                        cache1.unlockAll(keys);
+                        cache1.lockAll(keys).unlock();
 
                         // The keys should still be locked.
                         for (Integer key : keys)

modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java

@@ -70,15 +70,17 @@ public void testLockAtomicCache() throws IgniteCheckedException {
 
         final Ignite g0 = G.start(cfg);
 
+        final IgniteCache<Object, Object> cache = g0.jcache(null);
+
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return g0.jcache(null).lock(1).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+                return cache.lock(1).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
             }
         }, IgniteCheckedException.class, "Locks are not supported");
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                return g0.cache(null).lockAll(Arrays.asList(1), Long.MAX_VALUE);
+                return cache.lockAll(Collections.singleton(1)).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
             }
         }, IgniteCheckedException.class, "Locks are not supported");