From 49de015b6b49f64516557254e1e3713448ca4e6c Mon Sep 17 00:00:00 2001 From: vasraz Date: Wed, 17 Mar 2021 14:57:07 +0000 Subject: Improve test coverage Use Lombok annotations to improve test coverage Signed-off-by: Vasyl Razinkov Change-Id: Iaaed0023960cfe0a31e1b50fb868196ab488cb4c Issue-ID: SDC-3428 --- .../openecomp/sdc/be/config/ConfigurationTest.java | 150 --------------------- .../openecomp/sdc/fe/config/ConfigurationTest.java | 82 ----------- 2 files changed, 232 deletions(-) delete mode 100644 common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java delete mode 100644 common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java (limited to 'common-app-api/src/test') diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java deleted file mode 100644 index 23e0ab8439..0000000000 --- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java +++ /dev/null @@ -1,150 +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 org.junit.Test; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSettersExcluding; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.MatcherAssert.assertThat; - -public class ConfigurationTest { - public void validateBean() { - assertThat(Configuration.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding( - "excludedGroupTypesMapping", - "excludedPolicyTypesMapping", - "skipUpgradeVSPs", - "skipUpgradeVSPsFlag", - "supportAllottedResourcesAndProxy", - "supportAllottedResourcesAndProxyFlag") - )); - } - @Test - public void validateBeanForCassandrConfig() { - assertThat(Configuration.CassandrConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForSwitchoverDetectorConfig() { - assertThat(Configuration.SwitchoverDetectorConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForBeMonitoringConfig() { - assertThat(Configuration.BeMonitoringConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForArtifactTypeConfig() { - assertThat(Configuration.ArtifactTypeConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForOnboardingConfig() { - assertThat(Configuration.OnboardingConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForEcompPortalConfig() { - assertThat(Configuration.EcompPortalConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForApplicationL1CacheConfig() { - assertThat(Configuration.ApplicationL1CacheConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForApplicationL2CacheConfig() { - assertThat(Configuration.ApplicationL2CacheConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForToscaValidatorsConfig() { - assertThat(Configuration.ToscaValidatorsConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForApplicationL1CacheInfo() { - assertThat(Configuration.ApplicationL1CacheInfo.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForApplicationL1CacheCatalogInfo() { - assertThat(Configuration.ApplicationL1CacheCatalogInfo.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForQueueInfo() { - assertThat(Configuration.QueueInfo.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForEnvironmentContext() { - assertThat(Configuration.EnvironmentContext.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForPathsAndNamesDefinition() { - assertThat(Configuration.PathsAndNamesDefinition.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - @Test - public void validateBeanForGabConfig() { - assertThat(Configuration.GabConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSettersExcluding() - )); - } - -} diff --git a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java deleted file mode 100644 index ae30ccf502..0000000000 --- a/common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java +++ /dev/null @@ -1,82 +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.fe.config; - -import org.junit.Test; - -import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor; -import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; - - -public class ConfigurationTest { - - @Test - public void validateBean() { - assertThat(Configuration.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSetters() - )); - } - - @Test - public void validateFeMonitoringConfigBean() { - assertThat(Configuration.FeMonitoringConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSetters() - )); - } - - @Test - public void validateOnboardingConfigBean() { - assertThat(Configuration.OnboardingConfig.class, allOf( - hasValidBeanConstructor(), - hasValidGettersAndSetters() - )); - } - - @Test - public void validateGetHealthCheckSocketTimeoutInMsReturnsProperTime() { - final int defaultTestTimeout = 100; - final int setTestTimeout = 1000; - Configuration configuration = new Configuration(); - - assertEquals(configuration.getHealthCheckSocketTimeoutInMs(defaultTestTimeout).intValue(),defaultTestTimeout); - - configuration.setHealthCheckSocketTimeoutInMs(setTestTimeout); - assertEquals(configuration.getHealthCheckSocketTimeoutInMs(defaultTestTimeout).intValue(),setTestTimeout); - } - - @Test - public void validateGetHealthCheckIntervalInSecondsReturnsProperTime() { - final int defaultTestTimeout = 1; - final int setTestTimeout = 2; - Configuration configuration = new Configuration(); - - assertEquals(configuration.getHealthCheckIntervalInSeconds(defaultTestTimeout).intValue(),defaultTestTimeout); - - configuration.setHealthCheckIntervalInSeconds(setTestTimeout); - assertEquals(configuration.getHealthCheckIntervalInSeconds(defaultTestTimeout).intValue(),setTestTimeout); - } -} -- cgit 1.2.3-korg