test coverage

add unit tests for ResourceBaseValidator

Change-Id: Ib81a2f51d935156597eb055028d7e6da6e8d5834
Issue-ID: SDC-1864
Signed-off-by: talio <tali.orenbach@amdocs.com>

3 files changed, 43 insertions, 21 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
index 1972f6ed63..ba23c8b649 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/base/ResourceBaseValidator.java
@@ -52,6 +52,10 @@ public class ResourceBaseValidator implements Validator {
   private static final ErrorMessageCode ERROR_CODE_RBV_1 = new ErrorMessageCode("RBV1");
   private static final ErrorMessageCode ERROR_CODE_RBV_2 = new ErrorMessageCode("RBV2");
 
+  Map<String, ImplementationConfiguration> getResourceTypeToImpl() {
+    return MapUtils.unmodifiableMap(this.resourceTypeToImpl);
+  }
+
 @Override
   public void init(Map<String, Object> properties) {
     if (MapUtils.isEmpty(properties)) {
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/HeatResourceValidationContext.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/HeatResourceValidationContext.java
index 6067876532..97703b1de0 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/HeatResourceValidationContext.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/HeatResourceValidationContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2018 European Support Limited
+ *
+ * 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.
+ */
 package org.openecomp.sdc.validation.type;
 
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
@@ -5,10 +20,14 @@ import org.openecomp.sdc.validation.ValidationContext;
 
 import java.util.List;
 import java.util.Map;
+import lombok.Getter;
+import lombok.EqualsAndHashCode;
 
 /**
  * Created by TALIO on 2/23/2017.
  */
+@Getter
+@EqualsAndHashCode
 public class HeatResourceValidationContext implements ValidationContext {
 
   private HeatOrchestrationTemplate heatOrchestrationTemplate;
@@ -26,19 +45,6 @@ public class HeatResourceValidationContext implements ValidationContext {
 
     this.heatOrchestrationTemplate = heatOrchestrationTemplate;
     this.fileLevelResourceDependencies = fileLevelResourceDependencies;
-//    this.zipLevelResourceDependencies = zipLevelResourceDependencies;
     this.envFileName = envFileName;
   }
-
-  public HeatOrchestrationTemplate getHeatOrchestrationTemplate() {
-    return heatOrchestrationTemplate;
-  }
-
-  public Map<String, Map<String, Map<String, List<String>>>> getFileLevelResourceDependencies() {
-    return fileLevelResourceDependencies;
-  }
-
-  public String getEnvFileName() {
-    return envFileName;
-  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/NamingConventionValidationContext.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/NamingConventionValidationContext.java
index 273cdedfa5..25b846e42b 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/NamingConventionValidationContext.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-sdk/src/main/java/org/openecomp/sdc/validation/type/NamingConventionValidationContext.java
@@ -1,11 +1,31 @@
+/*
+ * Copyright © 2018 European Support Limited
+ *
+ * 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.
+ */
 package org.openecomp.sdc.validation.type;
 
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.validation.ValidationContext;
 
+import lombok.Getter;
+import lombok.EqualsAndHashCode;
+
 /**
  * Created by TALIO on 2/23/2017.
  */
+@Getter
+@EqualsAndHashCode
 public class NamingConventionValidationContext implements ValidationContext {
 
   private HeatOrchestrationTemplate heatOrchestrationTemplate;
@@ -17,12 +37,4 @@ public class NamingConventionValidationContext implements ValidationContext {
     this.heatOrchestrationTemplate = heatOrchestrationTemplate;
     this.envFileName = envFileName;
   }
-
-  public HeatOrchestrationTemplate getHeatOrchestrationTemplate() {
-    return heatOrchestrationTemplate;
-  }
-
-  public String getEnvFileName() {
-    return envFileName;
-  }
 }