aboutsummaryrefslogtreecommitdiffstats
path: root/common-app-api/src/test/java/org
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-12-10 18:55:03 +0200
committerTal Gitelman <tg851x@intl.att.com>2017-12-10 19:33:38 +0200
commit51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 (patch)
tree3ac236a864d74d19b0f5c9020891a7a7e5c31b44 /common-app-api/src/test/java/org
parentb5cc2e0695f195716d6ccdc65e73807a6632ec70 (diff)
Final commit to master merge from
Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'common-app-api/src/test/java/org')
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/CleanComponentsConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/ConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorInfoTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/Neo4jErrorsConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/be/config/validation/DeploymentArtifactHeatConfigurationTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactGroupTypeEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactTypeEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/HealthCheckInfoTest.java5
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/ResponseInfoTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInfoTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInterfaceTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/api/YamlSuffixEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/AuditingFieldsKeysEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/ESTimeBasedEventTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/MonitoringFieldsKeysEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/kpi/api/ASDCKpiApiTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/listener/AppContextListenerTest.java1
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/monitoring/MonitoringEventTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestConfigurationInfoTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseAsByteArrayTest.java4
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java1
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/test/TestExternalConfiguration.java14
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/test/YamlTest.java3
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/test/config/TestConfiguration.java4
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/CapabilityTypeNameEnumTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/GeneralUtilityTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/GsonFactoryTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/StreamUtilsTests.java1
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java2
-rw-r--r--common-app-api/src/test/java/org/openecomp/sdc/fe/config/ConfigurationTest.java3
35 files changed, 8 insertions, 80 deletions
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
index 592ab058b0..440f7587c7 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/BeEcompErrorManagerTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.be.config;
-import javax.annotation.Generated;
-
import org.junit.Test;
import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;
import org.openecomp.sdc.common.config.IEcompConfigurationManager;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/CleanComponentsConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/CleanComponentsConfigurationTest.java
index 86c78b236e..f7124d3eb4 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/CleanComponentsConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/CleanComponentsConfigurationTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.config;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.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
index 5b98270ee9..15508c540f 100644
--- 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
@@ -6,8 +6,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
import org.junit.Test;
import org.openecomp.sdc.be.config.Configuration.ApplicationL1CacheConfig;
import org.openecomp.sdc.be.config.Configuration.ApplicationL2CacheConfig;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
index 8eb9befa7f..03da2ffe8a 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/DistributionEngineConfigurationTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.config;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.ComponentArtifactTypesConfig;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration.CreateTopicConfig;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorConfigurationTest.java
index 47e380b7cc..d9e6066224 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorConfigurationTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.config;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorInfoTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorInfoTest.java
index 86bedf6beb..4c95543fb9 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorInfoTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/ErrorInfoTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.be.config;
-import javax.annotation.Generated;
-
import org.junit.Test;
import org.openecomp.sdc.be.config.ErrorInfo.ErrorInfoType;
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
index 2c62d6677c..6b7b163f45 100644
--- 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
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.config;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/be/config/validation/DeploymentArtifactHeatConfigurationTest.java b/common-app-api/src/test/java/org/openecomp/sdc/be/config/validation/DeploymentArtifactHeatConfigurationTest.java
index 616dbf9491..d2c394bff2 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/be/config/validation/DeploymentArtifactHeatConfigurationTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/be/config/validation/DeploymentArtifactHeatConfigurationTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.be.config.validation;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactGroupTypeEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactGroupTypeEnumTest.java
index ef313377c6..14519a45ef 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactGroupTypeEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactGroupTypeEnumTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactTypeEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactTypeEnumTest.java
index 466eb3bab2..525080e535 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactTypeEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ArtifactTypeEnumTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/HealthCheckInfoTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/HealthCheckInfoTest.java
index 7d2e3de68a..d37e1ccbb7 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/HealthCheckInfoTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/HealthCheckInfoTest.java
@@ -2,10 +2,7 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
-import org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckComponent;
import org.openecomp.sdc.common.api.HealthCheckInfo.HealthCheckStatus;
@@ -19,7 +16,7 @@ public class HealthCheckInfoTest {
@Test
public void testGetHealthCheckComponent() throws Exception {
HealthCheckInfo testSubject;
- HealthCheckComponent result;
+ String result;
// default test
testSubject = createTestSubject();
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ResponseInfoTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ResponseInfoTest.java
index 50c53d0587..d05484db40 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ResponseInfoTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ResponseInfoTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.api;
-import javax.annotation.Generated;
-
import org.junit.Test;
import org.openecomp.sdc.common.api.ResponseInfo.ResponseStatusEnum;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInfoTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInfoTest.java
index 0a83b8ec61..42b057e521 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInfoTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInfoTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInterfaceTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInterfaceTest.java
index 7d14df9c6d..9c19d3132d 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInterfaceTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/ToscaNodeTypeInterfaceTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/api/YamlSuffixEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/api/YamlSuffixEnumTest.java
index f731bb78fa..aeea08999f 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/api/YamlSuffixEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/api/YamlSuffixEnumTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.api;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/AuditingFieldsKeysEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/AuditingFieldsKeysEnumTest.java
index 521f2e38d1..ec55db5c95 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/AuditingFieldsKeysEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/AuditingFieldsKeysEnumTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.datastructure;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/ESTimeBasedEventTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/ESTimeBasedEventTest.java
index 2826b49c66..4d5d97b7fa 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/ESTimeBasedEventTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/ESTimeBasedEventTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.datastructure;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/MonitoringFieldsKeysEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/MonitoringFieldsKeysEnumTest.java
index 272c9d1796..515ee0bb76 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/MonitoringFieldsKeysEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/MonitoringFieldsKeysEnumTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.datastructure;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
index eac9196b75..9c18861d40 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/datastructure/WrapperTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.datastructure;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/kpi/api/ASDCKpiApiTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/kpi/api/ASDCKpiApiTest.java
index fa86708eb2..3ff24f2b07 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/kpi/api/ASDCKpiApiTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/kpi/api/ASDCKpiApiTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.kpi.api;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/listener/AppContextListenerTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/listener/AppContextListenerTest.java
index a9936adae5..298f6fe85d 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/listener/AppContextListenerTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/listener/AppContextListenerTest.java
@@ -2,7 +2,6 @@ package org.openecomp.sdc.common.listener;
import java.util.Map;
-import javax.annotation.Generated;
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/monitoring/MonitoringEventTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/monitoring/MonitoringEventTest.java
index 2e64590ccc..66f519197c 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/monitoring/MonitoringEventTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/monitoring/MonitoringEventTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.monitoring;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestConfigurationInfoTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestConfigurationInfoTest.java
index 89309e7c03..efbb7d799d 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestConfigurationInfoTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestConfigurationInfoTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.rest.api;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseAsByteArrayTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseAsByteArrayTest.java
index bb4c569f8a..c1bcae31cd 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseAsByteArrayTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseAsByteArrayTest.java
@@ -1,10 +1,6 @@
package org.openecomp.sdc.common.rest.api;
-import javax.annotation.Generated;
-
import org.junit.Test;
-import java.util.*;
-import org.junit.Assert;
public class RestResponseAsByteArrayTest {
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseTest.java
index c7fe36581d..1ca37b16df 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/rest/api/RestResponseTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.rest.api;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
index ae882d8a92..8cab6b4ed4 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Ignore;
import org.junit.Test;
import org.openecomp.sdc.common.api.Constants;
import org.openecomp.sdc.common.util.GeneralUtility;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/TestExternalConfiguration.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/TestExternalConfiguration.java
index e27e442e84..d2ec093f39 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/TestExternalConfiguration.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/TestExternalConfiguration.java
@@ -20,6 +20,9 @@
package org.openecomp.sdc.common.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -29,24 +32,13 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
import org.junit.Before;
import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
import org.openecomp.sdc.be.config.DistributionEngineConfiguration;
import org.openecomp.sdc.common.api.BasicConfiguration;
import org.openecomp.sdc.common.api.ConfigurationListener;
import org.openecomp.sdc.common.api.ConfigurationSource;
import org.openecomp.sdc.common.api.FileChangeCallback;
-import org.openecomp.sdc.common.impl.ConfigFileChangeListener;
import org.openecomp.sdc.common.impl.ExternalConfiguration;
import org.openecomp.sdc.common.impl.FSConfigurationSource;
import org.openecomp.sdc.common.test.config.TestConfiguration;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/YamlTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/YamlTest.java
index d45a61cebb..81e17849b1 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/YamlTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/YamlTest.java
@@ -20,7 +20,8 @@
package org.openecomp.sdc.common.test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.codec.binary.Base64;
import org.junit.BeforeClass;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/config/TestConfiguration.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/config/TestConfiguration.java
index b8bf394fd7..f8acf549fa 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/config/TestConfiguration.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/config/TestConfiguration.java
@@ -20,14 +20,14 @@
package org.openecomp.sdc.common.test.config;
+import static java.lang.String.format;
+
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.openecomp.sdc.common.api.BasicConfiguration;
-import static java.lang.String.format;
-
public class TestConfiguration extends BasicConfiguration {
/**
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/CapabilityTypeNameEnumTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/CapabilityTypeNameEnumTest.java
index 405da1076c..67862928ce 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/CapabilityTypeNameEnumTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/CapabilityTypeNameEnumTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.util;
-import javax.annotation.Generated;
-
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/GeneralUtilityTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/GeneralUtilityTest.java
index f574accd13..ebfffe572a 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/GeneralUtilityTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/GeneralUtilityTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.util;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Assert;
import org.junit.Test;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/GsonFactoryTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/GsonFactoryTest.java
index c11ccb79ce..0840d27934 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/GsonFactoryTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/GsonFactoryTest.java
@@ -1,7 +1,5 @@
package org.openecomp.sdc.common.util;
-import javax.annotation.Generated;
-
import org.junit.Test;
import com.google.gson.Gson;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/StreamUtilsTests.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/StreamUtilsTests.java
index 31dc5f5f47..deb9029e0d 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/StreamUtilsTests.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/StreamUtilsTests.java
@@ -30,7 +30,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.junit.Test;
-import org.openecomp.sdc.common.util.StreamUtils;
import fj.data.Either;
diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
index 2c4e0b7f00..9b30039023 100644
--- a/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
+++ b/common-app-api/src/test/java/org/openecomp/sdc/common/util/ValidationUtilsTest.java
@@ -2,8 +2,6 @@ package org.openecomp.sdc.common.util;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Assert;
import org.junit.Test;
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
index d034f2ddfa..6342da8222 100644
--- 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
@@ -3,10 +3,7 @@ package org.openecomp.sdc.fe.config;
import java.util.Date;
import java.util.List;
-import javax.annotation.Generated;
-
import org.junit.Test;
-import org.openecomp.sdc.be.config.Configuration.OnboardingConfig;
import org.openecomp.sdc.fe.config.Configuration.FeMonitoringConfig;