Added more tests to increase coverage

Removed redundant tests

Change-Id: I7776639d435267c4c38a32a7c19d925b0e715b15
Issue-ID: SDC-2869
Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>

2 files changed, 7 insertions, 21 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
index 555debfd34..c037832e58 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
@@ -23,8 +23,11 @@ package org.openecomp.core.enrichment.types;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 
+@AllArgsConstructor
 public enum ArtifactCategory {
 
   INFORMATIONAL("Informational"),
@@ -32,11 +35,9 @@ public enum ArtifactCategory {
 
   private static final Map<String, ArtifactCategory> mMap =
       Collections.unmodifiableMap(initializeMapping());
-  private String displayName;
 
-  ArtifactCategory(String displayName) {
-    this.displayName = displayName;
-  }
+  @Getter
+  private String displayName;
 
   /**
    * Initialize mapping map.
@@ -63,15 +64,4 @@ public enum ArtifactCategory {
     }
     return null;
   }
-
-  /**
-   * Gets display name.
-   *
-   * @return the display name
-   */
-  public String getDisplayName() {
-    return displayName;
-  }
-
-
 }
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
index 172dbc92e3..f85100b038 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
@@ -17,13 +17,9 @@
 package org.openecomp.core.enrichment.types;
 
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
-
-@Getter
-@Setter
+@Data
 public class CeilometerMetrics {
     private List<CeilometerMetric> ceilometerMetricList;
-
 }