X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigTest.java;h=257776dbf4355cf7d819df3ac7fd0ad92c5effc0;hb=0b2f51f6215dad3fc93d74572ad23f950ad8ae98;hp=ff1db6afdebb39db085bb5466b8144cd0735eb8e;hpb=84ccd9a7a490f524d950852b9f37f9befec8fd75;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 ff1db6af..257776db 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 @@ -20,181 +20,107 @@ package org.oransc.policyagent.configuration; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; 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.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; -import java.io.InputStreamReader; -import java.net.URL; -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.configuration.ApplicationConfig.Observer; 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; + @Mock + Observer observerMock1; @Mock - CbsClient cbsClient; + Observer observerMock2; - public static final ImmutableRicConfig CORRECT_RIC_CONIFG = ImmutableRicConfig.builder() // + private static final ImmutableRicConfig RIC_CONFIG_1 = ImmutableRicConfig.builder() // .name("ric1") // - .baseUrl("http://localhost:8080/") // - .managedElementIds(new Vector(Arrays.asList("kista_1", "kista_2"))) // + .baseUrl("ric1_url") // + .managedElementIds(new Vector<>()) // .build(); - private static EnvProperties properties() { - return ImmutableEnvProperties.builder() // - .consulHost("host") // - .consulPort(123) // - .cbsName("cbsName") // - .appName("appName") // - .build(); - } - @Test - public void whenTheConfigurationFits() throws IOException, ServiceException { + public void addRicShouldNotifyAllObserversOfRicAdded() throws Exception { + ApplicationConfig appConfigUnderTest = new ApplicationConfig(); - appConfigUnderTest = spy(ApplicationConfig.class); - appConfigUnderTest.systemEnvironment = new Properties(); - // When - doReturn(getCorrectJson()).when(appConfigUnderTest).createInputStream(any()); - appConfigUnderTest.initialize(); + appConfigUnderTest.addObserver(observerMock1); + appConfigUnderTest.addObserver(observerMock2); - // Then - verify(appConfigUnderTest, times(1)).loadConfigurationFromFile(any()); + appConfigUnderTest.setConfiguration(Arrays.asList(RIC_CONFIG_1), null, null); - Vector ricConfigs = appConfigUnderTest.getRicConfigs(); - RicConfig ricConfig = ricConfigs.firstElement(); - assertThat(ricConfigs).isNotNull(); - assertThat(ricConfig).isEqualTo(CORRECT_RIC_CONIFG); - } - - @Test - public void whenFileIsExistsButJsonIsIncorrect() throws IOException, ServiceException { + verify(observerMock1).onRicConfigUpdate(RIC_CONFIG_1, ApplicationConfig.RicConfigUpdate.ADDED); + verify(observerMock2).onRicConfigUpdate(RIC_CONFIG_1, ApplicationConfig.RicConfigUpdate.ADDED); - appConfigUnderTest = spy(ApplicationConfig.class); - appConfigUnderTest.systemEnvironment = new Properties(); + assertTrue(appConfigUnderTest.getRicConfigs().contains(RIC_CONFIG_1), "Ric not added to configuraions."); - // When - doReturn(getIncorrectJson()).when(appConfigUnderTest).createInputStream(any()); - appConfigUnderTest.loadConfigurationFromFile(any()); - - // Then - verify(appConfigUnderTest, times(1)).loadConfigurationFromFile(any()); - Assertions.assertNull(appConfigUnderTest.getRicConfigs()); + assertEquals(RIC_CONFIG_1, appConfigUnderTest.getRic(RIC_CONFIG_1.name()), + "Not correct Ric retrieved from configurations."); } @Test - public void whenPeriodicConfigRefreshNoEnvironmentVariables() { - - appConfigUnderTest = spy(ApplicationConfig.class); - appConfigUnderTest.systemEnvironment = new Properties(); - - final ListAppender logAppender = LoggingUtils.getLogListAppender(ApplicationConfig.class); - Flux task = appConfigUnderTest.createRefreshTask(); + public void changedRicShouldNotifyAllObserversOfRicChanged() throws Exception { + ApplicationConfig appConfigUnderTest = new ApplicationConfig(); - StepVerifier.create(task).expectSubscription().verifyComplete(); + appConfigUnderTest.addObserver(observerMock1); - assertTrue(logAppender.list.toString().contains("$CONSUL_HOST environment has not been defined")); - } - - @Test - public void whenPeriodicConfigRefreshNoConsul() { - appConfigUnderTest = spy(ApplicationConfig.class); - appConfigUnderTest.systemEnvironment = new Properties(); + appConfigUnderTest.setConfiguration(Arrays.asList(RIC_CONFIG_1), null, null); - EnvProperties props = properties(); - doReturn(Mono.just(props)).when(appConfigUnderTest).getEnvironment(any()); - - doReturn(Mono.just(cbsClient)).when(appConfigUnderTest).createCbsClient(props); - Flux err = Flux.error(new IOException()); - doReturn(err).when(cbsClient).updates(any(), any(), any()); + ImmutableRicConfig changedRicConfig = ImmutableRicConfig.builder() // + .name("ric1") // + .baseUrl("changed_ric1_url") // + .managedElementIds(new Vector<>()) // + .build(); - final ListAppender logAppender = LoggingUtils.getLogListAppender(ApplicationConfig.class); - Flux task = appConfigUnderTest.createRefreshTask(); + appConfigUnderTest.setConfiguration(Arrays.asList(changedRicConfig), null, null); - StepVerifier // - .create(task) // - .expectSubscription() // - .verifyComplete(); + verify(observerMock1).onRicConfigUpdate(RIC_CONFIG_1, ApplicationConfig.RicConfigUpdate.ADDED); + verify(observerMock1).onRicConfigUpdate(changedRicConfig, ApplicationConfig.RicConfigUpdate.CHANGED); - assertTrue( - logAppender.list.toString().contains("Could not refresh application configuration java.io.IOException")); + assertEquals(changedRicConfig, appConfigUnderTest.getRic(RIC_CONFIG_1.name()), + "Changed Ric not retrieved from configurations."); } @Test - public void whenPeriodicConfigRefreshSuccess() throws JsonIOException, JsonSyntaxException, IOException { - appConfigUnderTest = spy(ApplicationConfig.class); - appConfigUnderTest.systemEnvironment = new Properties(); + public void removedRicShouldNotifyAllObserversOfRicRemoved() { + ApplicationConfig appConfigUnderTest = new ApplicationConfig(); + + appConfigUnderTest.addObserver(observerMock1); - EnvProperties props = properties(); - doReturn(Mono.just(props)).when(appConfigUnderTest).getEnvironment(any()); - doReturn(Mono.just(cbsClient)).when(appConfigUnderTest).createCbsClient(props); + ImmutableRicConfig ricConfig2 = ImmutableRicConfig.builder() // + .name("ric2") // + .baseUrl("ric2_url") // + .managedElementIds(new Vector<>()) // + .build(); - Flux json = Flux.just(getJsonRootObject()); - doReturn(json).when(cbsClient).updates(any(), any(), any()); + appConfigUnderTest.setConfiguration(Arrays.asList(RIC_CONFIG_1, ricConfig2), null, null); - Flux task = appConfigUnderTest.createRefreshTask(); + appConfigUnderTest.setConfiguration(Arrays.asList(ricConfig2), null, null); - StepVerifier // - .create(task) // - .expectSubscription() // - .expectNext(appConfigUnderTest) // - .verifyComplete(); + verify(observerMock1).onRicConfigUpdate(RIC_CONFIG_1, ApplicationConfig.RicConfigUpdate.REMOVED); - Assertions.assertNotNull(appConfigUnderTest.getRicConfigs()); + assertEquals(1, appConfigUnderTest.getRicConfigs().size(), "Ric not deleted from configurations."); } - private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException { - JsonObject rootObject = (new JsonParser()).parse(new InputStreamReader(getCorrectJson())).getAsJsonObject(); - return rootObject; - } + @Test + public void gettingNotAddedRicShouldThrowException() { + ApplicationConfig appConfigUnderTest = new ApplicationConfig(); - private static InputStream getCorrectJson() throws IOException { - URL url = ApplicationConfigParser.class.getClassLoader().getResource("test_application_configuration.json"); - String string = Resources.toString(url, Charsets.UTF_8); - return new ByteArrayInputStream((string.getBytes(StandardCharsets.UTF_8))); - } + appConfigUnderTest.setConfiguration(Arrays.asList(RIC_CONFIG_1), null, null); - private static InputStream getIncorrectJson() { - String string = "{" + // - " \"config\": {" + // - " \"ric\": {"; // - return new ByteArrayInputStream((string.getBytes(StandardCharsets.UTF_8))); - } + Exception exception = assertThrows(ServiceException.class, () -> { + appConfigUnderTest.getRic("name"); + }); + assertEquals("Could not find ric: name", exception.getMessage()); + } }