Fix failing SetProcessorTests.testCopyFromOtherField test #70150
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
danhermann
added
:Data Management/Ingest Node
|
Pinging @elastic/es-core-features (Team:Core/Features) |
danhermann
commented
Mar 9, 2021
Comment on lines
+167
to
+179
| private static void assertMapEquals(Object actual, Object expected) { | ||
| if (expected instanceof Map) { | ||
| Map<?, ?> expectedMap = (Map<?, ?>) expected; | ||
| Map<?, ?> actualMap = (Map<?, ?>) actual; | ||
| assertThat(actualMap.keySet().toArray(), arrayContainingInAnyOrder(expectedMap.keySet().toArray())); | ||
| for (Map.Entry<?, ?> entry : actualMap.entrySet()) { | ||
| if (entry.getValue() instanceof Map) { | ||
| assertMapEquals(entry.getValue(), expectedMap.get(entry.getKey())); | ||
| } else { | ||
| assertThat(entry.getValue(), equalTo(expectedMap.get(entry.getKey()))); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
I would be happy if there were some Hamcrest magic that did this "deep-compare" of objects within maps automatically, but I couldn't find anything along those lines.
|
@elasticmachine update branch |
danhermann
added
>test
|
Thanks, @dakrone! |
danhermann
added a commit
to danhermann/elasticsearch
that referenced
this pull request
Mar 12, 2021
danhermann
added a commit
to danhermann/elasticsearch
that referenced
this pull request
Mar 12, 2021
danhermann
added a commit
that referenced
this pull request
Mar 12, 2021
danhermann
added a commit
that referenced
this pull request
Mar 12, 2021
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.
Fixes two problems with the
testCopyFromOtherFieldtest -- it should not choose a sub-object of the copy_from field as the target field and it should "deep-compare" any copied objects contained within maps as they will not be reference-equal after the fix in #69349.Fixes #69876.