X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigTest.java;h=6a4f8b3681bc69b3d4223d8346f9900f10e54223;hb=fb4bc7967a4733d10775351440a3af14327d5f20;hp=830a821c6477ea62e9a32c9478c3bb8313cd45ac;hpb=a5d9009b589b2d9a369a4da9feb83c9efa259e07;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java
index 830a821c..6a4f8b36 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigTest.java
@@ -21,22 +21,23 @@
 package org.oransc.policyagent.configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
+
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -46,21 +47,32 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Properties;
 import java.util.Vector;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
 import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties;
 import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.ImmutableEnvProperties;
 import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.utils.LoggingUtils;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class ApplicationConfigTest {
 
     private ApplicationConfig appConfigUnderTest;
-    CbsClient cbsClient = mock(CbsClient.class);
+
+    @Mock
+    CbsClient cbsClient;
 
     public static final ImmutableRicConfig CORRECT_RIC_CONIFG = ImmutableRicConfig.builder() //
         .name("ric1") //
@@ -84,13 +96,14 @@ public class ApplicationConfigTest {
         appConfigUnderTest.systemEnvironment = new Properties();
         // When
         doReturn(getCorrectJson()).when(appConfigUnderTest).createInputStream(any());
+        doReturn("fileName").when(appConfigUnderTest).getLocalConfigurationFilePath();
         appConfigUnderTest.initialize();
 
         // Then
-        verify(appConfigUnderTest, times(1)).loadConfigurationFromFile(any());
+        verify(appConfigUnderTest, times(1)).loadConfigurationFromFile();
 
-        Vector<RicConfig> ricConfigs = appConfigUnderTest.getRicConfigs();
-        RicConfig ricConfig = ricConfigs.firstElement();
+        Iterable<RicConfig> ricConfigs = appConfigUnderTest.getRicConfigs();
+        RicConfig ricConfig = ricConfigs.iterator().next();
         assertThat(ricConfigs).isNotNull();
         assertThat(ricConfig).isEqualTo(CORRECT_RIC_CONIFG);
     }
@@ -103,11 +116,12 @@ public class ApplicationConfigTest {
 
         // When
         doReturn(getIncorrectJson()).when(appConfigUnderTest).createInputStream(any());
-        appConfigUnderTest.loadConfigurationFromFile(any());
+        doReturn("fileName").when(appConfigUnderTest).getLocalConfigurationFilePath();
+        appConfigUnderTest.loadConfigurationFromFile();
 
         // Then
-        verify(appConfigUnderTest, times(1)).loadConfigurationFromFile(any());
-        Assertions.assertNull(appConfigUnderTest.getRicConfigs());
+        verify(appConfigUnderTest, times(1)).loadConfigurationFromFile();
+        Assertions.assertEquals(0, appConfigUnderTest.getRicConfigs().size());
     }
 
     @Test