-
Notifications
You must be signed in to change notification settings - Fork 10
Making rendering useful for formatting files (2) #454
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2fd7f93
Making rendering useful for formatting files.
kastoestoramadus 7cdda5b
tests added and code formatted
kastoestoramadus 1e87ad9
cleaning
kastoestoramadus 5798502
Minor updates to code and added tests
ekrich e28786d
Make abstract class private
ekrich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
sconfig/shared/src/test/scala/org/ekrich/config/impl/FormattingOptionsTest.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| package org.ekrich.config.impl | ||
|
|
||
| import org.junit.* | ||
| import org.ekrich.config.{ | ||
| ConfigFactory, | ||
| ConfigParseOptions, | ||
| ConfigRenderOptions, | ||
| FormattingOptions | ||
| } | ||
|
|
||
| class FormattingOptionsTest extends TestUtilsShared { | ||
| val parseOptions = ConfigParseOptions.defaults.setAllowMissing(true) | ||
| val myDefaultRenderOptions = ConfigRenderOptions.defaults | ||
| .setJson(false) | ||
| .setOriginComments(false) | ||
| .setComments(true) | ||
| .setFormatted(true) | ||
|
|
||
| def formatHocon( | ||
| str: String | ||
| )(implicit formattingOptions: FormattingOptions): String = | ||
| ConfigFactory | ||
| .parseString(str, parseOptions) | ||
| .root | ||
| .render(myDefaultRenderOptions.setFormattingOptions(formattingOptions)) | ||
|
|
||
| @Test | ||
| def noNewLineAtTheEnd(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions(newLineAtEnd = false) | ||
| val in = """r { | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
| val expected = "r {}" | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def newLineAtTheEnd(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions() | ||
| val in = """r { | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
| val expected = """r {} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def keepOriginOrderOfEntries(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions(keepOriginOrder = true) | ||
|
|
||
| val in = """r { | ||
| | p { | ||
| | s: ${r.ss} | ||
| | } | ||
| | f { | ||
| | s=t_f | ||
| | n="ALA" | ||
| | } | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
|
|
||
| val expected = """r { | ||
| | p { | ||
| | s=${r.ss} | ||
| | } | ||
| | f { | ||
| | s="t_f" | ||
| | n=ALA | ||
| | } | ||
| |} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def useTwoSpacesIndentation(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions(doubleIndent = false) | ||
|
|
||
| val in = """r { | ||
| | p { | ||
| | d { | ||
| | s: ${r.ss} | ||
| | } | ||
| | } | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
|
|
||
| val expected = """r { | ||
| | p { | ||
| | d { | ||
| | s=${r.ss} | ||
| | } | ||
| | } | ||
| |} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def useFourSpacesIndentation(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions() | ||
|
|
||
| val in = """r { | ||
| | p { | ||
| | d { | ||
| | s: ${r.ss} | ||
| | } | ||
| | } | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
|
|
||
| val expected = """r { | ||
| | p { | ||
| | d { | ||
| | s=${r.ss} | ||
| | } | ||
| | } | ||
| |} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def useColonAsAssignSign(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions(colonAssign = true) | ||
|
|
||
| val in = """r { | ||
| | s=t_f | ||
| | n-m=1 | ||
| | n:"ALA" | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
|
|
||
| val expected = """r { | ||
| | n:ALA | ||
| | "n-m":1 | ||
| | s:"t_f" | ||
| |} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
|
|
||
| @Test | ||
| def useEqualsAsAssignSign(): Unit = { | ||
| implicit val formattingOptions = FormattingOptions(colonAssign = false) | ||
|
|
||
| val in = """r { | ||
| | s=t_f | ||
| | n-m=1 | ||
| | n:"ALA" | ||
| |}""".stripMargin | ||
| val result = formatHocon(in) | ||
|
|
||
| val expected = """r { | ||
| | n=ALA | ||
| | "n-m"=1 | ||
| | s="t_f" | ||
| |} | ||
| |""".stripMargin | ||
| checkEqualObjects(result, expected) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
plus you've covered defaults with tests. Your changes look good