Improve SAML tests resiliency to auto-formatting #48452
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
The SAML tests have large XML documents within which various parameters are replaced. At present, if these test are auto-formatted, the XML documents get strung out over many, many lines, and are basically illegible. Fix this by using named placeholders for variables, and indent the multiline XML documents. The tests in `SamlSpMetadataBuilderTests` deserve a special mention, because they include a number of certificates in Base64. I extracted these into variables, for additional legibility.
pugnascotia
added
:Security/Security
|
Pinging @elastic/es-security (:Security/Security) |
rjernst
approved these changes
Oct 24, 2019
| return Arrays.stream(lines).collect(Collectors.joining(System.lineSeparator())); | ||
| } | ||
|
|
||
| private String normaliseXml(String input) { |
There was a problem hiding this comment.
I see you use that "other" English :)
There was a problem hiding this comment.
You mean the correct one? 
jkakavas
reviewed
Oct 25, 2019
| return values.get(paramName).toString(); | ||
| } | ||
|
|
||
| throw new IllegalArgumentException("No parameter value for %(" + paramName + ")"); |
jkakavas
approved these changes
Oct 25, 2019
There was a problem hiding this comment.
LGTM, and makes tests much more readable - thanks @pugnascotia
pugnascotia
added a commit
to pugnascotia/elasticsearch
that referenced
this pull request
Oct 25, 2019
The SAML tests have large XML documents within which various parameters are replaced. At present, if these test are auto-formatted, the XML documents get strung out over many, many lines, and are basically illegible. Fix this by using named placeholders for variables, and indent the multiline XML documents. The tests in `SamlSpMetadataBuilderTests` deserve a special mention, because they include a number of certificates in Base64. I extracted these into variables, for additional legibility.
pugnascotia
added a commit
that referenced
this pull request
Oct 27, 2019
Backport of #48452. The SAML tests have large XML documents within which various parameters are replaced. At present, if these test are auto-formatted, the XML documents get strung out over many, many lines, and are basically illegible. Fix this by using named placeholders for variables, and indent the multiline XML documents. The tests in `SamlSpMetadataBuilderTests` deserve a special mention, because they include a number of certificates in Base64. I extracted these into variables, for additional legibility.
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.
The SAML tests have large XML documents within which various parameters
are replaced. At present, if these test are auto-formatted, the XML
documents get strung out over many, many lines, and are basically
illegible.
Fix this by using named placeholders for variables, and indent the
multiline XML documents.
The tests in
SamlSpMetadataBuilderTestsdeserve a special mention,because they include a number of certificates in Base64. I extracted
these into variables, for additional legibility.