1 files changed, 64 insertions, 79 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 637510abba..77e2f2a837 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
@@ -7,9 +7,9 @@
  * 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.
@@ -31,82 +31,67 @@ import org.openecomp.sdc.validation.util.ValidationTestUtil;
 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);
-
-  }
-
-  @Test
-  public void testValidYaml() {
-
-    Map<String, MessageContainer> messages = runValidation(
-        RESOURCE_PATH + "/valid_yaml/input/validHeat.yaml");
-    Assert.assertNotNull(messages);
-    Assert.assertEquals(messages.size(), 0);
-  }
-
-  @Test
-  public void testInvalidTabYaml() {
-
-    Map<String, MessageContainer> messages = runValidation(
-        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: " +"[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(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: " +"[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(
-        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: " +"[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(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: " +"[YML1]: "+ Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
-        Messages.EMPTY_YAML_FILE.getErrorMessage());
-  }
+    private static final String RESOURCE_PATH = "/org/openecomp/validation/validators/yaml_validator";
+
+    public Map<String, MessageContainer> runValidation(String path) {
+        return new ValidationTestUtil().testValidator(new YamlValidator(), path);
+    }
+
+    @Test
+    public void testValidYaml() {
+        Map<String, MessageContainer> messages = runValidation(RESOURCE_PATH + "/valid_yaml/input/validHeat.yaml");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(0, messages.size());
+    }
+
+    @Test
+    public void testInvalidTabYaml() {
+
+        Map<String, MessageContainer> messages = runValidation(
+                RESOURCE_PATH + "/invalid_valid_yaml_structure/input/invalidYamlTab.yaml");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(1, messages.size());
+        new ValidationTestUtil().validateErrorMessage(
+                messages.get("invalidYamlTab.yaml").getErrorMessageList().get(0).getMessage(),
+                "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 = new ValidationTestUtil().testValidator(new YamlValidator(), RESOURCE_PATH + "/duplicateKey.yaml");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(1, messages.size());
+        Assert.assertTrue(messages.containsKey("duplicateKey.yaml"));
+        Assert.assertTrue(messages.get("duplicateKey.yaml").getErrorMessageList().get(0).getMessage().contains("Key_2_not_unique"));
+    }
+
+    @Test
+    public void testInvalidYamlStructure() {
+        Map<String, MessageContainer> messages = runValidation(RESOURCE_PATH + "/invalidYamlStructure.yaml");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(1, messages.size());
+        Assert.assertTrue(messages.containsKey("invalidYamlStructure.yaml"));
+        new ValidationTestUtil().validateErrorMessage(
+                messages.get("invalidYamlStructure.yaml").getErrorMessageList().get(0).getMessage(),
+                "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 '-' in 'reader', " +
+                        "line 10, column 7:          - shared: true          ^");
+    }
+
+    @Test
+    public void testEmptyYaml() {
+        Map<String, MessageContainer> messages = runValidation(RESOURCE_PATH + "/emptyYaml.yaml");
+        Assert.assertNotNull(messages);
+        Assert.assertEquals(1, messages.size());
+        Assert.assertTrue(messages.containsKey("emptyYaml.yaml"));
+        new ValidationTestUtil().validateErrorMessage(messages.get("emptyYaml.yaml").getErrorMessageList()
+                        .get(0).getMessage(),
+                "ERROR: " + "[YML1]: " + Messages.INVALID_YAML_FORMAT_REASON.getErrorMessage(),
+                Messages.EMPTY_YAML_FILE.getErrorMessage());
+    }
 
 }