1 files changed, 26 insertions, 27 deletions
diff --git a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/cps/CpsInterfaceServiceTest.java b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/cps/CpsInterfaceServiceTest.java
index 0ae7d4f3..96b5fe2d 100644
--- a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/cps/CpsInterfaceServiceTest.java
+++ b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/cps/CpsInterfaceServiceTest.java
@@ -3,6 +3,7 @@
  *  slice-analysis-ms
  *  ================================================================================
  *   Copyright (C) 2021-2022 Wipro Limited.
+ *   Copyright (C) 2022 CTC, Inc.
  *   ==============================================================================
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@ package org.onap.slice.analysis.ms.cps;
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -35,10 +37,8 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.onap.slice.analysis.ms.models.Configuration;
 import org.onap.slice.analysis.ms.restclients.CpsRestClient;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.modules.junit4.PowerMockRunnerDelegate;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -49,7 +49,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(SpringRunner.class)
 @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
-@PrepareForTest({CpsService.class, Configuration.class})
 @SpringBootTest(classes = CpsInterfaceServiceTest.class)
 public class CpsInterfaceServiceTest {
     @InjectMocks
@@ -59,52 +58,52 @@ public class CpsInterfaceServiceTest {
     CpsRestClient restClient;
 
     @Test
-    public void fetchCurrentConfigurationOfRICTest() {
+    public void fetchCurrentConfigurationOfRICTest() throws IOException {
         Map<String, Object> map = new HashMap<>();
         map.put("dLThptPerSlice", 10);
         map.put("uLThptPerSlice", 10);
         map.put("maxNumberOfConns", 10);
         Map<String, Map<String, Object>> responseMap = new HashMap<>();
         responseMap.put("11", map);
-        try {
-            String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/sliceConfig.json")));
-            Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
-                    .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/sliceConfig.json")));
+        Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
+                .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
         assertEquals(responseMap, cpsService.fetchCurrentConfigurationOfRIC("111-1111"));
     }
 
     @Test
-    public void fetchNetworkFunctionsOfSnssaiTest() {
+    public void fetchNetworkFunctionsOfSnssaiTest() throws IOException {
         List<String> responseList = new ArrayList<>();
         responseList.add("22");
         responseList.add("23");
-        try {
-            String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/DUList.json")));
-            Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
-                    .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/DUList.json")));
+        Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
+                .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
         assertEquals(responseList, cpsService.fetchNetworkFunctionsOfSnssai("111-1111"));
     }
 
     @Test
-    public void fetchRICsOfSnssaiTest() {
+    public void fetchRICsOfSnssaiTest() throws IOException {
         Map<String, List<String>> responseMap = new HashMap<>();
         List<String> cellslist = new ArrayList<>();
         cellslist.add("1599");
         cellslist.add("1598");
         responseMap.put("11", cellslist);
-        try {
-            String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/DUCellsList.json")));
-            Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
-                    .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/DUCellsList.json")));
+        Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
+                .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
         assertEquals(responseMap, cpsService.fetchRICsOfSnssai("111-1111"));
     }
+
+    @Test
+    public void fetchnrCellCUsOfSnssaiTest() throws IOException {
+        Map<String, List<String>> responseMap = new HashMap<>();
+        List<String> cellslist = new ArrayList<>();
+        cellslist.add("15199");
+        responseMap.put("11", cellslist);
+        String serviceInstance = new String(Files.readAllBytes(Paths.get("src/test/resources/DUCellsList.json")));
+        Mockito.when(restClient.sendPostRequest(Mockito.anyString(), Mockito.anyString(), Mockito.any()))
+                .thenReturn(new ResponseEntity<>(serviceInstance, HttpStatus.OK));
+        assertEquals(responseMap, cpsService.fetchnrCellCUsOfSnssai("111-1111"));
+    }
 }