Change the tests to run on Windows #2615
Merged
Conversation
This file contains 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
Most of the "expected" strings in terminal.go test were changed to
"text/template" values. Quotes in those string were parametrized in
the templates. Two functions handling templates were added
for convenience.
Templates has the advantage of:
- parametrize repetitive strings inside "expected" values
- inner and outer quotes were parametrized in templates
- long and confusing test values are more readable
- templates can be localized for other operating systems
+func checkFormat(string) in terminal_test.go
+func TemplateToString(string, interface{}) string in util/templates.go
Testing on unix is unchanged.
Testing on windows was achieved by:
- some test strings are OS dependent
- e.g. "echo abc && ..." in windows the parser is greedy and the first
argument will be "abc " (note the whitespace)
- quotes in some test strings were localized for windows
To make this painless in source code, new util function was added that
can return one of its arguments based on runtime OS.
+func Sieve(onUnix interface{}, onWindows interface{}) interface{}
junegunn
requested changes
Sep 23, 2021
util.TemplateToString() --> templateToString() util.OS.Sieve() --> inlined
junegunn
approved these changes
Sep 24, 2021
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I needed to write some tests, but the existing tests were failing on Windows. In this pull request you can find changes that make the tests run and pass on both platforms.
The first commit prepares the ground and make some strings in the tests parametric. I'm using the text/templates package from Go. The second commit then contains all changes related to Windows platform.