From 2edef3c2aaafba49439e20aa13eb647c67c781d5 Mon Sep 17 00:00:00 2001 From: Michal Banka Date: Wed, 19 Feb 2020 11:48:59 +0100 Subject: Added validation of configuration Fields are being validated right after reading servers details from JSON (when application starts). Created own annotation to validate server URL with proper requirements. When invalid details are given application closes. Signed-off-by: Michal Banka Change-Id: I3e476266056ec0fb637f01f9d4d4c63b1f0d1c6a Issue-ID: AAF-997 --- .../configuration/CmpServersConfigLoaderTest.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java') diff --git a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java index f4421ffe..b4eec400 100644 --- a/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java +++ b/certService/src/test/java/org/onap/aaf/certservice/certification/configuration/CmpServersConfigLoaderTest.java @@ -21,7 +21,13 @@ package org.onap.aaf.certservice.certification.configuration; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.onap.aaf.certservice.CertServiceApplication; import org.onap.aaf.certservice.certification.configuration.model.Cmpv2Server; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.PropertySource; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.IOException; import java.util.List; @@ -29,6 +35,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +@ExtendWith(SpringExtension.class) +@ContextConfiguration(classes = CertServiceApplication.class) class CmpServersConfigLoaderTest { private static final String EXISTING_CONFIG_FILENAME = "cmpServers.json"; private static final String NONEXISTING_CONFIG_FILENAME = "nonexisting_cmpServers.json"; @@ -49,13 +57,16 @@ class CmpServersConfigLoaderTest { "RV", "yyy" ); + @Autowired + private CmpServersConfigLoader configLoader; + @Test - public void shouldLoadCmpServersConfigWhenFileAvailable() throws IOException { + public void shouldLoadCmpServersConfigWhenFileAvailable() { // Given String path = getClass().getClassLoader().getResource(EXISTING_CONFIG_FILENAME).getFile(); // When - List cmpServers = new CmpServersConfigLoader().load(path); + List cmpServers = configLoader.load(path); // Then assertThat(cmpServers).isNotNull(); @@ -67,7 +78,7 @@ class CmpServersConfigLoaderTest { @Test() public void shouldReturnEmptyListWhenFileMissing() { // When - List cmpServers = new CmpServersConfigLoader().load(NONEXISTING_CONFIG_FILENAME); + List cmpServers = configLoader.load(NONEXISTING_CONFIG_FILENAME); // Then assertThat(cmpServers).isNotNull(); -- cgit 1.2.3-korg