X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fmusic%2Funittests%2FTstRestMusicLockAPI.java;h=7e45e1600986e42ea80d46e7eda35cdca8324012;hb=bdde056e3e994a6970ef182397812a3ddf56b70e;hp=75bfa0f2bee41c4aeedace0eca4db3fa86ee215e;hpb=3d3c903eff4f4c90ff3ca90d1d84435fed188f72;p=music.git

diff --git a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
index 75bfa0f2..7e45e160 100644
--- a/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
+++ b/src/test/java/org/onap/music/unittests/TstRestMusicLockAPI.java
@@ -39,6 +39,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.music.datastore.MusicDataStoreHandle;
 import org.onap.music.datastore.PreparedQueryObject;
 import org.onap.music.datastore.jsonobjects.JsonInsert;
+import org.onap.music.datastore.jsonobjects.JsonLeasedLock;
 import org.onap.music.datastore.jsonobjects.JsonTable;
 import org.onap.music.exceptions.MusicServiceException;
 import org.onap.music.lockingservice.cassandra.CassaLockStore;
@@ -123,9 +124,23 @@ public class TstRestMusicLockAPI {
     	assertEquals(200, response.getStatus());
     }
     
+    @Test
+    public void test_accquireLockWLease() throws Exception {
+        System.out.println("Testing acquire lock with lease");
+        createAndInsertIntoTable();
+        String lockRef = createLockReference();
+
+        JsonLeasedLock jsonLock = new JsonLeasedLock();
+        jsonLock.setLeasePeriod(10000); //10 second lease period?
+        Response response = lock.accquireLockWithLease(jsonLock, lockRef, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
+    
     @Test
     public void test_accquireBadLock() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing acquire lock that is not lock-holder");
 		createAndInsertIntoTable();
 
     	String lockRef1 = createLockReference();
@@ -140,7 +155,7 @@ public class TstRestMusicLockAPI {
     
     @Test
     public void test_currentLockHolder() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing get current lock holder");
 		createAndInsertIntoTable();
 
     	String lockRef = createLockReference();
@@ -155,7 +170,7 @@ public class TstRestMusicLockAPI {
     
     @Test
     public void test_unLock() throws Exception {
-    	System.out.println("Testing acquire lock");
+    	System.out.println("Testing unlock");
 		createAndInsertIntoTable();
     	String lockRef = createLockReference();
 
@@ -164,6 +179,34 @@ public class TstRestMusicLockAPI {
     	System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
     	assertEquals(200, response.getStatus());
     }
+    
+    @Test
+    public void test_getLockState() throws Exception {
+        System.out.println("Testing get lock state");
+        createAndInsertIntoTable();
+
+        String lockRef = createLockReference();
+
+        Response response = lock.currentLockState(lockName, "1", "1", authorization,
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+        Map<String,Object> respMap = (Map<String, Object>) response.getEntity();
+        assertEquals(lockRef, ((Map<String,String>) respMap.get("lock")).get("lock-holder"));
+    }
+    
+    @Test
+    public void test_deleteLock() throws Exception {
+        System.out.println("Testing get lock state");
+        createAndInsertIntoTable();
+
+        String lockRef = createLockReference();
+
+        Response response = lock.deleteLock(lockName, "1", "1",
+                "abc66ccc-d857-4e90-b1e5-df98a3d40ce6", authorization, appName);
+        System.out.println("Status: " + response.getStatus() + ". Entity " + response.getEntity());
+        assertEquals(200, response.getStatus());
+    }
 	
 	/**
 	 * Create table and lock reference