[android] Fix tilde/home directory tests. #2144
Merged
Conversation
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
In Android, the home directory is the root directory. Foundation returns the right one, but the tests where checking against having a final trailing slash, which is not true if the home directory is the root directory. The change adds an extra check to avoid the failure in case the resulting tilde expansion is just the root directory. The comment explains why the change is needed. Additionally, instead of using `+` to add two strings, `appendingPathComponent` is used to build an expected value from the result of `NSHomeDirectory()`, in order to deal with cases where the `NSHomeDirectory()` has a trailing slash.
|
@swift-ci please test |
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.
In Android, the home directory is the root directory. Foundation returns
the right one, but the tests where checking against having a final
trailing slash, which is not true if the home directory is the root
directory.
The change adds an extra check to avoid the failure in case the
resulting tilde expansion is just the root directory. The comment
explains why the change is needed.
Additionally, instead of using
+to add two strings,appendingPathComponentis used to build an expected value from theresult of
NSHomeDirectory(), in order to deal with cases where theNSHomeDirectory()has a trailing slash.