Add asserts to silence Sonar warnings re tests

[portal/ric-dashboard.git] / webapp-backend / src / test / java / org / oransc / ric / portal / dashboard / config / CaasIngressMockConfiguration.java

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/CaasIngressMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/CaasIngressMockConfiguration.java
index 96ccbb8..b10dcc8 100644 (file)
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/CaasIngressMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/CaasIngressMockConfiguration.java
@@ -25,10 +25,9 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.invoke.MethodHandles;
 
+import org.oransc.ric.portal.dashboard.TestUtils;
 import org.oransc.ric.portal.dashboard.k8sapi.SimpleKubernetesClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,31 +56,12 @@ public class CaasIngressMockConfiguration {
                this.delayMs = delayMs;
        }
 
-       private String readDataFromPath(String path) throws IOException {
-               InputStream is = MethodHandles.lookup().lookupClass().getClassLoader().getResourceAsStream(path);
-               if (is == null) {
-                       String msg = "Failed to find resource on classpath: " + path;
-                       logger.error(msg);
-                       throw new RuntimeException(msg);
-               }
-               InputStreamReader reader = new InputStreamReader(is, "UTF-8");
-               StringBuilder sb = new StringBuilder();
-               char[] buf = new char[8192];
-               int i;
-               while ((i = reader.read(buf)) > 0)
-                       sb.append(buf, 0, i);
-               reader.close();
-               is.close();
-               return sb.toString();
-       }
-
        private SimpleKubernetesClient simpleKubernetesClient(String instanceKey) throws IOException {
                // File in src/test/resources
-               String pltPods;
-               if (RICInstanceMockConfiguration.INSTANCE_KEY_1.equals(instanceKey))
-                       pltPods = readDataFromPath("caas-ingress-ricplt-pods-1.json");
-               else
-                       pltPods = readDataFromPath("caas-ingress-ricplt-pods-2.json");
+               String podFile = RICInstanceMockConfiguration.INSTANCE_KEY_1.equals(instanceKey)
+                               ? "caas-ingress-ricplt-pods-1.json"
+                               : "caas-ingress-ricplt-pods-2.json";
+               String pltPods = TestUtils.readDataFromPath(podFile);
                SimpleKubernetesClient mockClient = mock(SimpleKubernetesClient.class);
                doAnswer(inv -> {
                        String ns = inv.<String>getArgument(0);