1 files changed, 108 insertions, 56 deletions
diff --git a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
index 46cc5de..3b26541 100644
--- a/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
+++ b/pmdictionaryvalidation/src/test/java/org/onap/validation/yaml/YamlLoaderTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  *
  */
-
 package org.onap.validation.yaml;
 
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.onap.validation.yaml.exception.YamlProcessingException;
 import org.onap.validation.yaml.model.YamlDocument;
@@ -24,73 +24,125 @@ import org.onap.validation.yaml.model.YamlDocumentFactory;
 import org.yaml.snakeyaml.parser.ParserException;
 import org.yaml.snakeyaml.scanner.ScannerException;
 
+import java.io.IOException;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-
 class YamlLoaderTest {
-
     private static final int EXPECTED_NUMBER_OF_DOCUMENTS = 5;
     private static final String LETTER_S_WITH_ASCII_CODE = "s(115)";
 
-    @Test
-    void shouldLoadAllDocumentsFromYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
-        //when
-        List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
-
-        //then
-        assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
-    }
-
-    @Test
-    void shouldLoadAllDocumentsFromJsonStyleYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
-        //when
-        List<YamlDocument> documents = YamlLoadingUtils.loadValidJsonStyleMultiDocumentYamlFile();
-
-        //then
-        assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
-    }
-
-    @Test
-    void shouldLoadAllDocumentsFromYamlFileUsingPathInString() throws YamlProcessingException {
-        //when
-        List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFileUsingStringPath();
-
-        //then
-        assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
-    }
-
-    @Test
-    void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFile() {
-        //when /then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFile)
-                .isInstanceOf(ParserException.class)
-                .hasMessageContaining("expected the node content, but found '<document end>'");
-    }
-
-    @Test
-    void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFileUsingPathInString() {
-        //when /then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFileUsingStringPath)
-                .isInstanceOf(ParserException.class)
-                .hasMessageContaining("expected the node content, but found '<document end>'");
+    @Nested
+    class FromUrlLoader {
+        @Test
+        void shouldLoadAllDocumentsFromYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
+            // when
+            List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFile();
+
+            // then
+            assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
+        }
+
+        @Test
+        void shouldLoadAllDocumentsFromJsonStyleYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException {
+            // when
+            List<YamlDocument> documents = YamlLoadingUtils.loadValidJsonStyleMultiDocumentYamlFile();
+
+            // then
+            assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFile() {
+            // when then
+            assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFile)
+                    .isInstanceOf(ParserException.class)
+                    .hasMessageContaining("expected the node content, but found '<document end>'");
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingInvalidYamlFileWithIncorrectKeyMapping() {
+            // when then
+            assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithIncorrectKeyMapping)
+                    .isInstanceOf(ScannerException.class)
+                    .hasMessageContaining("mapping values are not allowed here");
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingInvalidYamlFileWithUnknownEscapeCharacter() {
+            // when then
+            assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithUnknownEscapeCharacter)
+                    .isInstanceOf(ScannerException.class)
+                    .hasMessageContaining("found unknown escape character " + LETTER_S_WITH_ASCII_CODE);
+        }
     }
 
-    @Test
-    void shouldThrowExceptionWhenLoadingInvalidYamlFileWithIncorrectKeyMapping() {
-        //when /then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithIncorrectKeyMapping)
-                .isInstanceOf(ScannerException.class)
-                .hasMessageContaining("mapping values are not allowed here");
+    @Nested
+    class FromStringPathLoader {
+        @Test
+        void shouldLoadAllDocumentsFromYamlFileUsingPathInString() throws YamlProcessingException {
+            // when
+            List<YamlDocument> documents = YamlLoadingUtils.loadValidMultiDocumentYamlFileUsingStringPath();
+
+            // then
+            assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFileUsingPathInString() {
+            // when then
+            assertThatThrownBy(YamlLoadingUtils::tryToLoadMultiDocumentInvalidYamlFileUsingStringPath)
+                    .isInstanceOf(ParserException.class)
+                    .hasMessageContaining("expected the node content, but found '<document end>'");
+        }
     }
 
-    @Test
-    void shouldThrowExceptionWhenLoadingInvalidYamlFileWithUnknownEscapeCharacter() {
-        //when /then
-        assertThatThrownBy(YamlLoadingUtils::tryToLoadInvalidYamlFileWithUnknownEscapeCharacter)
-                .isInstanceOf(ScannerException.class)
-                .hasMessageContaining("found unknown escape character " + LETTER_S_WITH_ASCII_CODE);
+    @Nested
+    class FromByteArrayLoader {
+        private final YamlLoader YAML_LOADER = new YamlLoader(new YamlDocumentFactory());
+
+        @Test
+        void shouldLoadAllDocumentsFromYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException, IOException {
+            // when
+            List<YamlDocument> documents = YAML_LOADER.loadMultiDocumentYaml(YamlLoadingUtils.readFile(YamlLoadingUtils.PATH_TO_VALID_YAML));
+
+            // then
+            assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
+        }
+
+        @Test
+        void shouldLoadAllDocumentsFromJsonStyleYamlFile() throws YamlDocumentFactory.YamlDocumentParsingException, IOException {
+            // when
+            List<YamlDocument> documents = YAML_LOADER.loadMultiDocumentYaml(YamlLoadingUtils.readFile(YamlLoadingUtils.PATH_TO_VALID_JSON_STYLE_YAML));
+
+            // then
+            assertThat(documents).hasSize(EXPECTED_NUMBER_OF_DOCUMENTS);
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingDocumentsFromInvalidYamlFile() {
+            // when then
+            assertThatThrownBy(() -> YAML_LOADER.loadMultiDocumentYaml(YamlLoadingUtils.readFile(YamlLoadingUtils.PATH_TO_MULTI_DOCUMENT_INVALID_YAML)))
+                    .isInstanceOf(ParserException.class)
+                    .hasMessageContaining("expected the node content, but found '<document end>'");
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingInvalidYamlFileWithIncorrectKeyMapping() {
+            // when then
+            assertThatThrownBy(() -> YAML_LOADER.loadMultiDocumentYaml(YamlLoadingUtils.readFile(YamlLoadingUtils.PATH_TO_INVALID_YAML_WITH_INCORRECT_KEY_MAPPING)))
+                    .isInstanceOf(ScannerException.class)
+                    .hasMessageContaining("mapping values are not allowed here");
+        }
+
+        @Test
+        void shouldThrowExceptionWhenLoadingInvalidYamlFileWithUnknownEscapeCharacter() {
+            // when then
+            assertThatThrownBy(() -> YAML_LOADER.loadMultiDocumentYaml(YamlLoadingUtils.readFile(YamlLoadingUtils.PATH_TO_INVALID_YAML_WITH_UNKNOWN_ESCAPE_CHARACTER)))
+                    .isInstanceOf(ScannerException.class)
+                    .hasMessageContaining("found unknown escape character " + LETTER_S_WITH_ASCII_CODE);
+        }
     }
 }