From acd364bb34d1288e3999c5c6ccf5fa8fba752e22 Mon Sep 17 00:00:00 2001 From: vasraz Date: Thu, 8 Jun 2023 15:39:40 +0100 Subject: Remove unused Neo4jErrorsConfiguration Signed-off-by: Vasyl Razinkov Change-Id: Ib9aa060057718144766c6061823bbae076647fca Issue-ID: SDC-4532 --- .../be/config/Neo4jErrorsConfigurationTest.java | 58 ---------------------- .../sdc/common/impl/FSConfigurationSourceTest.java | 23 +++------ 2 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java (limited to 'common-app-api/src/test') diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java deleted file mode 100644 index 3ecc802fdb..0000000000 --- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019 Nokia. - * ================================================================================ - * 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.openecomp.sdc.be.config; - -import java.util.Collections; -import java.util.Map; - -import org.junit.Test; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanToString; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; - - -public class Neo4jErrorsConfigurationTest { - @Test - public void validateBean() { - assertThat(Neo4jErrorsConfiguration.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding(), - hasValidBeanToString() - )); - } - @Test - public void testGetErrorMessage() { - final String testKey = "key"; - final String testValue = "value"; - Neo4jErrorsConfiguration neo4jErrorsConfiguration = new Neo4jErrorsConfiguration(); - neo4jErrorsConfiguration.setErrors(Collections.singletonMap(testKey,testValue)); - - assertEquals( - neo4jErrorsConfiguration.getErrorMessage(testKey), - testValue - ); - } -} diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java index b9116bb34d..78a4f8911a 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/impl/FSConfigurationSourceTest.java @@ -20,17 +20,17 @@ package org.openecomp.sdc.common.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.be.config.Configuration; import org.openecomp.sdc.be.config.ErrorConfiguration; -import org.openecomp.sdc.be.config.Neo4jErrorsConfiguration; import org.openecomp.sdc.common.api.Constants; -public class FSConfigurationSourceTest { +class FSConfigurationSourceTest { + @Test - public void calculateFileNameWhenSplitRequired() { + void calculateFileNameWhenSplitRequired() { Class clazz = ErrorConfiguration.class; String expected = "error-configuration" + Constants.YAML_SUFFIX; @@ -40,7 +40,7 @@ public class FSConfigurationSourceTest { } @Test - public void calculateFileNameWhenNoSplitRequired() { + void calculateFileNameWhenNoSplitRequired() { Class clazz = Configuration.class; String expected = "configuration" + Constants.YAML_SUFFIX; @@ -49,13 +49,4 @@ public class FSConfigurationSourceTest { assertEquals(expected, actual); } - @Test - public void calculateFileNameWithCamelCaseAndDigits() { - Class clazz = Neo4jErrorsConfiguration.class; - - String expected = "neo4j-errors-configuration" + Constants.YAML_SUFFIX; - String actual = FSConfigurationSource.calculateFileName(clazz); - - assertEquals(expected, actual); - } -} \ No newline at end of file +} -- cgit 1.2.3-korg