From af33af5536780e1b8f80f1a2e32fb9f970509314 Mon Sep 17 00:00:00 2001
From: "aravind.est" <aravindhan.a@est.tech>
Date: Thu, 24 Aug 2023 17:38:16 +0100
Subject: [PATCH] Add tests for cache service

Tests added for rApp cache service.

Issue-ID: NONRTRIC-910
Signed-off-by: aravind.est <aravindhan.a@est.tech>
Change-Id: I773ded21763472ce9ca2f0e4ceff5c3697ef75da
---
 .../rappmanager/models/cache/RappCacheService.java |  8 +---
 .../models/cache/BeanTestConfiguration.java        | 15 ++++++
 .../models/cache/RappCacheServiceTest.java         | 55 ++++++++++++++++++++++
 3 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100755 rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/BeanTestConfiguration.java
 create mode 100755 rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
index d81dd71..16c231c 100755
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java
@@ -20,7 +20,6 @@ package com.oransc.rappmanager.models.cache;
 
 import com.oransc.rappmanager.models.rapp.Rapp;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -37,11 +36,8 @@ public class RappCacheService {
 
     public Collection<Rapp> getAllRapp() {
         Cache cache = cacheManager.getCache(RAPP_CACHE);
-        if (cache != null) {
-            Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
-            return nativeCache.values();
-        }
-        return List.of();
+        Map<String, Rapp> nativeCache = (Map<String, Rapp>) cache.getNativeCache();
+        return nativeCache.values();
     }
 
     public Optional<Rapp> getRapp(String rappId) {
diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/BeanTestConfiguration.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/BeanTestConfiguration.java
new file mode 100755
index 0000000..74273a3
--- /dev/null
+++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/BeanTestConfiguration.java
@@ -0,0 +1,15 @@
+package com.oransc.rappmanager.models.cache;
+
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.context.annotation.Bean;
+
+@TestConfiguration
+class BeanTestConfiguration {
+
+    @Bean
+    public CacheManager cacheManager() {
+        return new ConcurrentMapCacheManager();
+    }
+}
diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java
new file mode 100755
index 0000000..4ef0253
--- /dev/null
+++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java
@@ -0,0 +1,55 @@
+package com.oransc.rappmanager.models.cache;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.oransc.rappmanager.models.rapp.Rapp;
+import java.util.UUID;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = {BeanTestConfiguration.class, RappCacheService.class})
+class RappCacheServiceTest {
+
+    @Autowired
+    RappCacheService rappCacheService;
+
+
+    @Test
+    void testPutRapp() {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp = Rapp.builder().rappId(rappId).name(String.valueOf(rappId)).build();
+        rappCacheService.putRapp(rapp);
+        assertNotNull(rappCacheService.getRapp(String.valueOf(rappId)).get());
+        assertEquals(rappCacheService.getRapp(String.valueOf(rappId)).get().getRappId(), rappId);
+        rappCacheService.deleteRapp(rapp);
+    }
+
+    @Test
+    void testGetRapps() {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp = Rapp.builder().rappId(rappId).name(String.valueOf(rappId)).build();
+        rappCacheService.putRapp(rapp);
+        assertNotNull(rappCacheService.getAllRapp());
+        assertThat(rappCacheService.getAllRapp()).hasSize(1);
+        rappCacheService.deleteRapp(rapp);
+    }
+
+    @Test
+    void testGetRappsEmpty() {
+        assertNotNull(rappCacheService.getAllRapp());
+        assertThat(rappCacheService.getAllRapp()).isEmpty();
+    }
+
+    @Test
+    void testDeleteRapp() {
+        UUID rappId = UUID.randomUUID();
+        Rapp rapp = Rapp.builder().rappId(rappId).name(String.valueOf(rappId)).build();
+        rappCacheService.putRapp(rapp);
+        assertEquals(rappCacheService.getRapp(String.valueOf(rappId)).get().getRappId(), rappId);
+        rappCacheService.deleteRapp(rapp);
+        assertThat(rappCacheService.getRapp(String.valueOf(rappId))).isEmpty();
+    }
+}
-- 
2.16.6