Skip to content

Sync unified change-streams tests #1550

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Sync unified change-streams tests #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ore/src/test/resources/unified-test-format/change-streams/change-streams-clusterTime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"minServerVersion": "4.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"load-balanced",
"sharded"
],
Expand Down
1 change: 0 additions & 1 deletion .../test/resources/unified-test-format/change-streams/change-streams-disambiguatedPaths.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"minServerVersion": "6.1.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"load-balanced",
"sharded"
],
Expand Down
4 changes: 2 additions & 2 deletions driver-core/src/test/resources/unified-test-format/change-streams/change-streams-errors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"minServerVersion": "4.1.11",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
]
}
Expand Down Expand Up @@ -190,7 +190,7 @@
"minServerVersion": "4.2",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
]
}
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/unified-test-format/change-streams/change-streams-pre_and_post_images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "6.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/resources/unified-test-format/change-streams/change-streams-resume-allowlist.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "3.6",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down
2 changes: 1 addition & 1 deletion .../test/resources/unified-test-format/change-streams/change-streams-resume-errorLabels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"minServerVersion": "4.3.1",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded",
"load-balanced"
],
"serverless": "forbid"
Expand Down
2 changes: 0 additions & 2 deletions .../test/resources/unified-test-format/change-streams/change-streams-showExpandedEvents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"minServerVersion": "6.0.0",
"topologies": [
"replicaset",
"sharded-replicaset",
"sharded"
],
"serverless": "forbid"
Expand Down Expand Up @@ -463,7 +462,6 @@
"runOnRequirements": [
{
"topologies": [
"sharded-replicaset",
"sharded"
]
}
Expand Down
5 changes: 0 additions & 5 deletions driver-core/src/test/resources/unified-test-format/change-streams/change-streams.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@
"expectEvents": [
{
"client": "client0",
"ignoreExtraEvents": true,
"events": [
{
"commandStartedEvent": {
Expand Down Expand Up @@ -256,7 +255,6 @@
"expectEvents": [
{
"client": "client0",
"ignoreExtraEvents": true,
"events": [
{
"commandStartedEvent": {
Expand Down Expand Up @@ -293,7 +291,6 @@
"expectEvents": [
{
"client": "client0",
"ignoreExtraEvents": true,
"events": [
{
"commandStartedEvent": {
Expand Down Expand Up @@ -349,7 +346,6 @@
"expectEvents": [
{
"client": "client0",
"ignoreExtraEvents": true,
"events": [
{
"commandStartedEvent": {
Expand Down Expand Up @@ -436,7 +432,6 @@
"expectEvents": [
{
"client": "client0",
"ignoreExtraEvents": true,
"events": [
{
"commandStartedEvent": {
Expand Down
7 changes: 7 additions & 0 deletions ...ams/src/test/functional/com/mongodb/reactivestreams/client/unified/ChangeStreamsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ final class ChangeStreamsTest extends UnifiedReactiveStreamsTest {
"Test that comment is not set on getMore - pre 4.4"
);

private static final List<String> TESTS_WITH_EXTRA_EVENTS =
Arrays.asList(
"Test with document comment",
Copy link
Contributor

@nhachicha nhachicha Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's also Test with document comment - pre 4.4 should this one also be skipped as well?
Never mind this is already skipped by https://github.com/mongodb/mongo-java-driver/pull/1550/files#diff-d13241ef919ff6af0a634af668614719b4827edb20476a9144c7814e78b5d7fbR42

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is skipped via ERROR_REQUIRED_FROM_CHANGE_STREAM_INITIALIZATION_TESTS above.

"Test with string comment"
);

private static final List<String> REQUIRES_BATCH_CURSOR_CREATION_WAITING =
Arrays.asList(
"Change Stream should error when an invalid aggregation stage is passed in",
Expand All @@ -59,6 +65,7 @@ final class ChangeStreamsTest extends UnifiedReactiveStreamsTest {
protected void skips(final String fileDescription, final String testDescription) {
assumeFalse(ERROR_REQUIRED_FROM_CHANGE_STREAM_INITIALIZATION_TESTS.contains(testDescription));
assumeFalse(EVENT_SENSITIVE_TESTS.contains(testDescription));
assumeFalse(TESTS_WITH_EXTRA_EVENTS.contains(testDescription));
}

@BeforeEach
Expand Down