1 files changed, 22 insertions, 16 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/YamlValidatorTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/YamlValidatorTest.java
index 32e847004c..98a8122ed6 100644
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/YamlValidatorTest.java
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/impl/validators/YamlValidatorTest.java
@@ -32,6 +32,8 @@ import java.util.Map;
 public class YamlValidatorTest {
 
 
+  private static final String RESOURCE_PATH = "/org/openecomp/validation/validators/yaml_validator";
+
   public Map<String, MessageContainer> runValidation(String path) {
     YamlValidator validator = new YamlValidator();
     return ValidationTestUtil.testValidator(validator, path);
@@ -42,7 +44,7 @@ public class YamlValidatorTest {
   public void testValidYaml() {
 
     Map<String, MessageContainer> messages = runValidation(
-        "/org/openecomp/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml");
+        RESOURCE_PATH + "/valid_yaml/input/validHeat.yaml");
     Assert.assertNotNull(messages);
     Assert.assertEquals(messages.size(), 0);
   }
@@ -51,56 +53,60 @@ public class YamlValidatorTest {
   public void testInvalidTabYaml() {
 
     Map<String, MessageContainer> messages = runValidation(
-        "/org/openecomp/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml");
+        RESOURCE_PATH + "/invalid_valid_yaml_structure/input/invalidYamlTab.yaml");
     Assert.assertNotNull(messages);
     Assert.assertEquals(messages.size(), 1);
     ValidationTestUtil.validateErrorMessage(
         messages.get("invalidYamlTab.yaml").getErrorMessageList().get(0).getMessage(),
-        "ERROR: " + Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
-        "while scanning for the next tokenfound character '\\t(TAB)' that cannot start any token. (Do not use \\t(TAB) for indentation) in 'reader', line 14, column 5:        \tadmin_state_up: true        ^");
-
+        "ERROR: " +"[YML2]: "+ Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while scanning for the next tokenfound character '\\t(TAB)' that cannot start " +
+            "any token. (Do not use \\t(TAB) for indentation) in 'reader', line 14, " +
+            "column 5:        \tadmin_state_up: true        ^");
   }
 
-
   @Test
   public void testDuplicateKeyInYaml() {
 
     Map<String, MessageContainer> messages =
-        runValidation("/org/openecomp/validation/validators/yaml_validator/duplicateKey.yaml");
+        runValidation(RESOURCE_PATH + "/duplicateKey.yaml");
     Assert.assertNotNull(messages);
     Assert.assertEquals(messages.size(), 1);
     Assert.assertTrue(messages.containsKey("duplicateKey.yaml"));
     ValidationTestUtil.validateErrorMessage(
         messages.get("duplicateKey.yaml").getErrorMessageList().get(0).getMessage(),
-        "ERROR: " + Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
-        "while parsing MappingNode in 'reader', line 6, column 3:      Key_1_unique:      ^duplicate key: Key_2_not_unique in 'reader', line 31, column 1:        ^");
+        "ERROR: " +"[YML2]: "+ Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while parsing MappingNode in 'reader', line 6, column 3:      " +
+            "Key_1_unique:      ^duplicate key: Key_2_not_unique in 'reader', line 31, " +
+            "column 1:        ^");
   }
 
-
   @Test
   public void testInvalidYamlStructure() {
 
     Map<String, MessageContainer> messages = runValidation(
-        "/org/openecomp/validation/validators/yaml_validator/invalidYamlStructure.yaml");
+        RESOURCE_PATH + "/invalidYamlStructure.yaml");
     Assert.assertNotNull(messages);
     Assert.assertEquals(messages.size(), 1);
     Assert.assertTrue(messages.containsKey("invalidYamlStructure.yaml"));
     ValidationTestUtil.validateErrorMessage(
         messages.get("invalidYamlStructure.yaml").getErrorMessageList().get(0).getMessage(),
-        "ERROR: " + Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
-        "while parsing a block mapping in 'reader', line 8, column 7:          admin_state_up: true          ^expected <block end>, but found BlockEntry in 'reader', line 10, column 7:          - shared: true          ^");
+        "ERROR: " +"[YML2]: "+ Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+        "while parsing a block mapping in 'reader', line 8, column 7:          " +
+            "admin_state_up: true          ^expected <block end>, but found BlockEntry in 'reader', " +
+            "line 10, column 7:          - shared: true          ^");
   }
 
   @Test
   public void testEmptyYaml() {
 
     Map<String, MessageContainer> messages =
-        runValidation("/org/openecomp/validation/validators/yaml_validator/emptyYaml.yaml");
+        runValidation(RESOURCE_PATH + "/emptyYaml.yaml");
     Assert.assertNotNull(messages);
     Assert.assertEquals(messages.size(), 1);
     Assert.assertTrue(messages.containsKey("emptyYaml.yaml"));
-    ValidationTestUtil.validateErrorMessage(messages.get("emptyYaml.yaml").getErrorMessageList().get(0).getMessage(),
-        "ERROR: " + Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+    ValidationTestUtil.validateErrorMessage(messages.get("emptyYaml.yaml").getErrorMessageList()
+            .get(0).getMessage(),
+        "ERROR: " +"[YML1]: "+ Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
         Messages.EMPTY_YAML_FILE.getErrorMessage());
   }