Fix WebSocket subscription tests #27
Merged
Conversation
This file contains 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
AlexBlumer
commented
Dec 6, 2021
Comment on lines
+434
to
+435
| assertThat(msg.get("subscriptionName"), instanceOf(String.class)); | ||
| assertThat(callback.getMessage().getHeaders().get("X-Request-Id"), instanceOf(String.class)); |
There was a problem hiding this comment.
This way we don't get an NPE/cast error if the values are wrong. The one test that uses these values now assigns them after the asserts.
Comment on lines
437
to
442
| // Sometimes the connection occurs during the validations above. Check for completion only if it's not connected | ||
| if (!callback.isConnected()) { | ||
| callback.reset(); | ||
| callback.waitForCompletion(); | ||
| assertThat("Connected", callback.isConnected(), is(true)); | ||
| } |
There was a problem hiding this comment.
If the connection message comes fast enough, it will occur before the reset. The assert here will then fail since reset() clears all the flags used by the test callback class.
There was a problem hiding this comment.
Might put the assert outside of the IF, just so it is always checked. Makes test clearer to me.
Suggested change
| // Sometimes the connection occurs during the validations above. Check for completion only if it's not connected | |
| if (!callback.isConnected()) { | |
| callback.reset(); | |
| callback.waitForCompletion(); | |
| assertThat("Connected", callback.isConnected(), is(true)); | |
| } | |
| // Sometimes the connection occurs during the validations above. | |
| // So wait for completion only if it's not already connected | |
| if (!callback.isConnected()) { | |
| callback.reset(); | |
| callback.waitForCompletion(); | |
| } | |
| assertThat("Connected", callback.isConnected(), is(true)); |
rblumer4
approved these changes
Dec 6, 2021
Comment on lines
437
to
442
| // Sometimes the connection occurs during the validations above. Check for completion only if it's not connected | ||
| if (!callback.isConnected()) { | ||
| callback.reset(); | ||
| callback.waitForCompletion(); | ||
| assertThat("Connected", callback.isConnected(), is(true)); | ||
| } |
There was a problem hiding this comment.
Might put the assert outside of the IF, just so it is always checked. Makes test clearer to me.
Suggested change
| // Sometimes the connection occurs during the validations above. Check for completion only if it's not connected | |
| if (!callback.isConnected()) { | |
| callback.reset(); | |
| callback.waitForCompletion(); | |
| assertThat("Connected", callback.isConnected(), is(true)); | |
| } | |
| // Sometimes the connection occurs during the validations above. | |
| // So wait for completion only if it's not already connected | |
| if (!callback.isConnected()) { | |
| callback.reset(); | |
| callback.waitForCompletion(); | |
| } | |
| assertThat("Connected", callback.isConnected(), is(true)); |
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 #26
The
requestIdchanges are due to PR Vantiq/ag2rs#7934, It removed the field from the subscription's return, presumably because the value is also available in the headerX-Request-Id.