[fix][test] Made ProtobufNativeSchemaTest.testSchema order-independent#1
Open
[fix][test] Made ProtobufNativeSchemaTest.testSchema order-independent#1
Conversation
15 tasks
d39852c to
c84ac39
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
c84ac39 to
3473283
Compare
3473283 to
6f31a65
Compare
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
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 apache#24804
Motivation
In ProtobufNativeSchemaTest.testSchema, the json's contents and the FileDescriptorSet field's contents do not have a deterministic order but the hardcoded string assertion assumes a deterministic order. The json serializer did not guarantee attribute order and inside FileDescriptorSet the contents can also be in different orders due to different generation paths or environments producing the contents in different orders despite the logical content being the same. Since the original test compared the raw strings/trees "as-is", harmless re-ordering could flip the test from pass to fail without any real schema change.
Modifications
We no longer compare raw strings/trees "as-is". Instead we decode the FileDescriptorSet and compare it semantically be converting both to JSON and asserting equality using a mode that doesn't require array order to match but forbids extra fields. Next, we remove FileDescriptorSet from the outer JSON and compare the remainder with an order-agnostic (for keys) but non-extensible JSON assertion. We implemented this two stage approach because JSON assertion does not re-order the inner contents of the json values even if they can be re-ordered.
This change keeps the spirit of the original test while eliminating failures caused solely by allowed reordering.
Verifying this change
This change is already covered by existing tests, such as
org.apache.pulsar.client.impl.schema.ProtobufSchemaTest#testSchema.Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
docdoc-requireddoc-not-neededdoc-completeMatching PR in forked repository
PR in forked repository: