-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[fix][test] Fixed ResponseBody Check in Test Helper #24872
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Closing and reopening to trigger a new CI run with a new merge commit internally with latest changes from master branch. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #24872 +/- ##
============================================
+ Coverage 74.34% 75.27% +0.92%
- Complexity 33496 35723 +2227
============================================
Files 1913 1920 +7
Lines 149315 156043 +6728
Branches 17331 18622 +1291
============================================
+ Hits 111012 117462 +6450
- Misses 29475 29588 +113
- Partials 8828 8993 +165
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
(cherry picked from commit 2463254)
(cherry picked from commit 2463254)
Fixes #24869
Motivation
Each of the below tests utilized a helper test method (called test) which incorrectly assumed that the json key-value pairs in responseBody would have a deterministic order. The order of key-value pairs is not guaranteed in JSON, however. As a result, the ordering can change due to different environments producing the contents in different orders despite the logical contents being the same. Each of the tests below used this helper to compare the responseBody "as-is" with an incorrect equals method so harmless re-ordering could flip the tests from pass to fail despite the data being semantically the same.
org.apache.pulsar.io.http.HttpSinkTest#testGenericRecordorg.apache.pulsar.io.http.HttpSinkTest#testKeyValueGenericRecordorg.apache.pulsar.io.http.HttpSinkTest#testKeyValuePrimitivesThis fix is similar to this other pull request which was previously merged (with the small difference that I used the test library these tests were already utilizing instead): #24821
Modifications
We no longer compare raw strings "as-is" with
WireMock.equalTo. Instead, we compare the json structures withWireMock.equalToJsonto perform a semantic comparison of the input JSON against the expected JSON as described in their documentation. This ensures the tests pass consistently, even when the serializer outputs fields in a different order.In essence, these changes keep the spirit of the original tests while eliminating failures caused solely by allowed (but previously unexpected) reordering.
Verifying this change
This change is already covered by existing tests, such as
org.apache.pulsar.io.http.HttpSinkTest#testGenericRecordorg.apache.pulsar.io.http.HttpSinkTest#testKeyValueGenericRecordorg.apache.pulsar.io.http.HttpSinkTest#testKeyValuePrimitivesorg.apache.pulsar.io.http.HttpSinkTest#testKeyValueGenericRecordDoes 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: LucasEby#6