Commit 165f829

authored

Merge pull request #1061 from oracle/empty-yaml-file

make sure that the new Yaml parser returns an empty dictionary when p...

2 parents 535f7d5 + 3916708 commit 165f829Copy full SHA for 165f829

File tree

+14

-0

lines changed

+14

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ protected PyDictionary parseInternal(InputStream inputStream) throws YamlExcepti`
`68`	`68`	`}`
`69`	`69`	`if (docCount == 1) {`
`70`	`70`	`firstDoc = convertJavaDataStructureToPython(docToConvert);`
	`71`	`+ } else if (docCount == 0) {`
	`72`	`+ firstDoc = getNewDictionary();`
`71`	`73`	`}`
`72`	`74`	`} catch (Exception ex) {`
`73`	`75`	`YamlException pex = new YamlException("WLSDPLY-18100", ex, this.fileName, ex.getLocalizedMessage());`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,16 @@`
`32`	`32`
`33`	`33`	`public class YamlTranslatorTest {`
`34`	`34`
	`35`	`+ @Test`
	`36`	`+ public void testEmptyModelReturnsPyDictionary() throws Exception {`
	`37`	`+ File yamlFile = new File("src/test/resources/yaml/empty.yaml").getAbsoluteFile();`
	`38`	`+ YamlTranslator yamlTranslator = new YamlTranslator(yamlFile.getAbsolutePath(), true);`
	`39`	`+`
	`40`	`+ PyDictionary actual = yamlTranslator.parse();`
	`41`	`+`
	`42`	`+ assertNotNull(actual, "empty model file should return dict");`
	`43`	`+ }`
	`44`	`+`
`35`	`45`	`@Test`
`36`	`46`	`public void testFlatMapScalarTypes() throws Exception {`
`37`	`47`	`File yamlFile = new File("src/test/resources/yaml/flat-map-with-scalars.yaml").getAbsoluteFile();`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Copyright (c) 2022, Oracle Corporation and/or its affiliates. All rights reserved.`
	`2`	`+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.`

Comments

(0)