refactoring

redisson/src/test/java/org/redisson/RedissonFairLockTest.java

@@ -189,15 +189,6 @@ public class RedissonFairLockTest extends BaseConcurrentTest {
         assertThat(System.currentTimeMillis() - startTime).isBetween(2990L, 3100L);
     }
     
-    @Test
-    public void testDelete() {
-        RLock lock = redisson.getFairLock("lock");
-        Assert.assertFalse(lock.delete());
-
-        lock.lock();
-        Assert.assertTrue(lock.delete());
-    }
-
     @Test
     public void testForceUnlock() {
         RLock lock = redisson.getFairLock("lock");

redisson/src/test/java/org/redisson/RedissonLockTest.java

@@ -30,15 +30,6 @@ public class RedissonLockTest extends BaseConcurrentTest {
         assertThat(System.currentTimeMillis() - startTime).isBetween(2990L, 3100L);
     }
     
-    @Test
-    public void testDelete() {
-        RLock lock = redisson.getLock("lock");
-        Assert.assertFalse(lock.delete());
-
-        lock.lock();
-        Assert.assertTrue(lock.delete());
-    }
-
     @Test
     public void testForceUnlock() {
         RLock lock = redisson.getLock("lock");

redisson/src/test/java/org/redisson/RedissonReadWriteLockTest.java

@@ -324,13 +324,13 @@ public class RedissonReadWriteLockTest extends BaseConcurrentTest {
         Assert.assertFalse(lock.writeLock().tryLock());
         Assert.assertFalse(lock.writeLock().isLocked());
         Assert.assertFalse(lock.writeLock().isHeldByCurrentThread());
-        lock.writeLock().delete();
+        lock.writeLock().forceUnlock();
     }
 
     @Test
     public void testMultiRead() throws InterruptedException {
         final RReadWriteLock lock = redisson.getReadWriteLock("lock");
-        Assert.assertFalse(lock.readLock().delete());
+        Assert.assertFalse(lock.readLock().forceUnlock());
 
         final RLock readLock1 = lock.readLock();
         readLock1.lock();
@@ -374,16 +374,7 @@ public class RedissonReadWriteLockTest extends BaseConcurrentTest {
         Assert.assertFalse(lock.writeLock().isLocked());
         Assert.assertFalse(lock.writeLock().isHeldByCurrentThread());
         Assert.assertTrue(lock.writeLock().tryLock());
-        lock.writeLock().delete();
+        lock.writeLock().forceUnlock();
-    }
-
-    @Test
-    public void testDelete() {
-        RReadWriteLock lock = redisson.getReadWriteLock("lock");
-        Assert.assertFalse(lock.readLock().delete());
-
-        lock.readLock().lock();
-        Assert.assertTrue(lock.readLock().delete());
     }
 
     @Test
@@ -594,7 +585,7 @@ public class RedissonReadWriteLockTest extends BaseConcurrentTest {
             lock.unlock();
         } finally {
             // clear scheduler
-            lock.delete();
+            lock.forceUnlock();
         }
     }
 

redisson/src/test/java/org/redisson/RedissonRedLockTest.java

@@ -252,7 +252,7 @@ public class RedissonRedLockTest {
         t.start();
         t.join(1000);
 
-        lockFirst.delete();
+        lockFirst.forceUnlock();
         
         RedissonMultiLock lock = new RedissonRedLock(lock1, lock2, lock3);
         lock.lock();