X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FA1ClientFactoryTest.java;h=23cb6710e94ee36bd91522ae3529bc11f22b258f;hb=14accd2e91460d1651fe2c228fe1ba964cbfb6a6;hp=926485dcf5fc175ac5791f742f1578d188f1e2ec;hpb=86b589317c67eb2350870c9c57c35eac3e9056f6;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientFactoryTest.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientFactoryTest.java index 926485dc..23cb6710 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientFactoryTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/A1ClientFactoryTest.java @@ -2,7 +2,7 @@ * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2019 Nordix Foundation + * Copyright (C) 2020 Nordix Foundation * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ package org.oransc.policyagent.clients; +import static ch.qos.logback.classic.Level.WARN; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -28,10 +29,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; + import java.util.Vector; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +44,7 @@ import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.utils.LoggingUtils; + import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -127,7 +130,7 @@ public class A1ClientFactoryTest { .expectNext(sdnrOnapA1ClientMock) // .verifyComplete(); - assertEquals(A1ProtocolType.SDNR_ONAP, ric.getProtocolVersion(), "Not correct protocol"); + assertEquals(A1ProtocolType.SDNC_ONAP, ric.getProtocolVersion(), "Not correct protocol"); } @Test @@ -137,14 +140,14 @@ public class A1ClientFactoryTest { whenGetProtocolVersionOscA1ClientThrowException(); whenGetProtocolVersionStdA1ClientThrowException(); - final ListAppender logAppender = LoggingUtils.getLogListAppender(A1ClientFactory.class); + final ListAppender logAppender = LoggingUtils.getLogListAppender(A1ClientFactory.class, WARN); StepVerifier.create(factoryUnderTest.createA1Client(ric)) // .expectSubscription() // .expectErrorMatches( throwable -> throwable instanceof Exception && throwable.getMessage().equals(EXCEPTION_MESSAGE)) .verify(); - assertEquals(Level.WARN, logAppender.list.get(0).getLevel(), "Warning not logged"); + assertEquals(WARN, logAppender.list.get(0).getLevel(), "Warning not logged"); assertTrue(logAppender.list.toString().contains("Could not get protocol version from RIC: " + RIC_NAME), "Correct message not logged"); @@ -177,7 +180,7 @@ public class A1ClientFactoryTest { private void whenGetProtocolVersionSdnrOnapA1ClientReturnCorrectProtocol() { doReturn(sdnrOnapA1ClientMock).when(factoryUnderTest).createSdnrOnapA1Client(any(Ric.class)); - when(sdnrOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.just(A1ProtocolType.SDNR_ONAP)); + when(sdnrOnapA1ClientMock.getProtocolVersion()).thenReturn(Mono.just(A1ProtocolType.SDNC_ONAP)); } private void whenGetProtocolVersionSdncOscA1ClientThrowException() {