1 files changed, 15 insertions, 45 deletions
diff --git a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/SliceUtilizationTest.java b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/SliceUtilizationTest.java
index 90202366..1de57060 100644
--- a/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/SliceUtilizationTest.java
+++ b/components/slice-analysis-ms/src/test/java/org/onap/slice/analysis/ms/service/SliceUtilizationTest.java
@@ -3,6 +3,7 @@
  *  slice-analysis-ms
  *  ================================================================================
  *   Copyright (C) 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.
@@ -22,12 +23,12 @@
 package org.onap.slice.analysis.ms.service;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -49,13 +50,9 @@ import org.onap.slice.analysis.ms.models.Configuration;
 import org.onap.slice.analysis.ms.models.SliceConfigRequest;
 import org.onap.slice.analysis.ms.models.SliceConfigResponse;
 import org.onap.slice.analysis.ms.restclients.DesRestClient;
-import org.powermock.api.mockito.PowerMockito;
 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -63,7 +60,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(SpringRunner.class)
-@PrepareForTest({SliceUtilization.class, Configuration.class})
 @PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
 @SpringBootTest(classes = SliceUtilizationTest.class)
 public class SliceUtilizationTest {
@@ -90,19 +86,10 @@ public class SliceUtilizationTest {
     }
 
     @Test
-    public void getPmDataTest() throws Exception {
+    public void getPmDataTest() throws IOException {
         configuration.setDesUrl("http://des:1681/datalake/v1/exposure/pm_data");
         configuration.setPmDataDurationInWeeks(4);
-        PowerMockito.mockStatic(SliceUtilization.class);
-        PowerMockito.mockStatic(Configuration.class);
-        PowerMockito.when(Configuration.getInstance()).thenReturn(configuration);
-        String pmData = null;
-        try {
-            pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        }
+        String pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
         Mockito.when(desRestClient.sendPostRequest(Mockito.any(), Mockito.any(), Mockito.any()))
                 .thenReturn(new ResponseEntity<>(pmData, HttpStatus.OK));
         JSONObject actualResponse = sliceUtilization.getPMData("001-1100");
@@ -111,30 +98,23 @@ public class SliceUtilizationTest {
     }
 
     @Test
-    public void calculateSliceUtilizationTest() throws Exception {
+    public void calculateSliceUtilizationTest() throws IOException {
 
-        PowerMockito.mockStatic(SliceUtilization.class);
         List<JSONObject> pmDataList = new ArrayList<>();
         String pmData;
-        try {
-            pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
-            JSONObject pmDataObj = new JSONObject(pmData);
-            pmDataList.add(pmDataObj);
-            pmDataList.add(pmDataObj);
-            pmDataList.add(pmDataObj);
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        }
+        pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
+        JSONObject pmDataObj = new JSONObject(pmData);
+        pmDataList.add(pmDataObj);
+        pmDataList.add(pmDataObj);
+        pmDataList.add(pmDataObj);
         AggregatedConfig actualResponse = sliceUtilization.calculateSliceUtilization(pmDataList);
         assertEquals(190857028, (int) actualResponse.getDLThptPerSlice());
         assertEquals(119285978, (int) actualResponse.getULThptPerSlice());
     }
 
     @Test
-    public void getSliceUtilizationDataTest() throws Exception {
+    public void getSliceUtilizationDataTest() throws IOException {
 
-        PowerMockito.mockStatic(SliceUtilization.class);
         SliceConfigRequest sliceConfigRequest = new SliceConfigRequest();
         List<String> sliceIdentifiersList = new ArrayList<>();
         sliceIdentifiersList.add("14559ead-f4fe-4c1c-a94c-8015fad3ea35");
@@ -150,21 +130,11 @@ public class SliceUtilizationTest {
         configuration.setDesUrl("http://des:1681/datalake/v1/exposure/pm_data");
         configuration.setPmDataDurationInWeeks(4);
 
-        PowerMockito.mockStatic(SliceUtilization.class);
-        PowerMockito.mockStatic(Configuration.class);
-        PowerMockito.when(Configuration.getInstance()).thenReturn(configuration);
+        Mockito.when(aaiService.getSnssaiList(Mockito.any())).thenReturn(snssaiList);
 
-        try {
-
-            Mockito.when(aaiService.getSnssaiList(Mockito.any())).thenReturn(snssaiList);
-
-            String pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
-            Mockito.when(desRestClient.sendPostRequest(Mockito.any(), Mockito.any(), Mockito.any()))
-                    .thenReturn(new ResponseEntity<>(pmData, HttpStatus.OK));
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        }
+        String pmData = new String(Files.readAllBytes(Paths.get("src/test/resources/pm_data.json")));
+        Mockito.when(desRestClient.sendPostRequest(Mockito.any(), Mockito.any(), Mockito.any()))
+                .thenReturn(new ResponseEntity<>(pmData, HttpStatus.OK));
         SliceConfigResponse actualResponse = sliceUtilization.getSliceUtilizationData(sliceConfigRequest);
         String actualResponseString = objectMapper.writeValueAsString(actualResponse);
         SliceConfigResponse sliceConfigResponse = objectMapper