diff options
2 files changed, 62 insertions, 1 deletions
diff --git a/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevel.java b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevel.java index 2325ebc..fb3b958 100644 --- a/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevel.java +++ b/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/client/utils/ssl/SslSupportLevel.java @@ -68,7 +68,15 @@ public enum SslSupportLevel { .build(); } catch (GeneralSecurityException e) { - LOGGER.error("Could not initialize client due to SSL exception: {}. Default client without SSL support will be used instead.\nCause: {}", e.getMessage(), e.getCause()); + String errorMessage = + String.format( + "Could not initialize client due to SSL exception: %s. " + + "Default client without SSL support will be used instead." + + "\nCause: %s", + e.getMessage(), + e.getCause() + ); + LOGGER.error(errorMessage, e); client = NONE.getClient(requestConfig, sslAuthenticationHelper); } return client; diff --git a/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java new file mode 100644 index 0000000..2d65097 --- /dev/null +++ b/pnfsimulator/src/test/java/org/onap/pnfsimulator/template/FsToDbTemplateSynchronizerTest.java @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START======================================================= + * Simulator + * ================================================================================ + * Copyright (C) 2020 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.pnfsimulator.template; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.read.ListAppender; +import org.junit.jupiter.api.Test; +import org.slf4j.LoggerFactory; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class FsToDbTemplateSynchronizerTest { + + + @Test + public void shouldReturnErrorSynchronizedMessage() { + //given + FsToDbTemplateSynchronizer fsToDbTemplateSynchronizer = new FsToDbTemplateSynchronizer("someInvalidValue", null); + Logger logger = (Logger) LoggerFactory.getLogger(FsToDbTemplateSynchronizer.class); + ListAppender<ILoggingEvent> listAppender = new ListAppender<>(); + listAppender.start(); + logger.addAppender(listAppender); + //when + fsToDbTemplateSynchronizer.synchronize(); + List<ILoggingEvent> logsList = listAppender.list; + //then + assertEquals("Cannot synchronize templates. Check whether the proper folder exists.", logsList.get(0) + .getMessage()); + assertEquals(Level.ERROR, logsList.get(0) + .getLevel()); + } +}
\ No newline at end of file |