Skip to content

Commit c5e68fc

Browse files
committed
- Re-enable JAVA-5949-skipped SDAM/backpressure tests
- Fixed https://jira.mongodb.org/browse/JAVA-5664 (https://jira.mongodb.org/browse/DRIVERS-1785)
1 parent 508d741 commit c5e68fc

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

driver-sync/src/test/functional/com/mongodb/client/unified/EventMatcher.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.mongodb.event.CommandStartedEvent;
2727
import com.mongodb.event.CommandSucceededEvent;
2828
import com.mongodb.event.ConnectionCheckOutFailedEvent;
29+
import com.mongodb.event.ConnectionCheckedInEvent;
2930
import com.mongodb.event.ConnectionClosedEvent;
3031
import com.mongodb.event.ConnectionCreatedEvent;
3132
import com.mongodb.event.ConnectionPoolClearedEvent;
@@ -208,6 +209,12 @@ public void waitForConnectionPoolEvents(final String client, final BsonDocument
208209
case "connectionReadyEvent":
209210
eventClass = ConnectionReadyEvent.class;
210211
break;
212+
case "connectionClosedEvent":
213+
eventClass = ConnectionClosedEvent.class;
214+
break;
215+
case "connectionCheckedInEvent":
216+
eventClass = ConnectionCheckedInEvent.class;
217+
break;
211218
default:
212219
throw new UnsupportedOperationException("Unsupported event: " + event.getFirstKey());
213220
}

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,8 @@ private OperationResult executeWaitForEvent(final UnifiedTestContext context, fi
800800
case "poolReadyEvent":
801801
case "connectionCreatedEvent":
802802
case "connectionReadyEvent":
803+
case "connectionClosedEvent":
804+
case "connectionCheckedInEvent":
803805
context.getEventMatcher().waitForConnectionPoolEvents(clientId, event, count, entities.getConnectionPoolListener(clientId));
804806
break;
805807
case "serverHeartbeatStartedEvent":

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -433,12 +433,6 @@ public static void applyCustomizations(final TestDef def) {
433433
.test("server-discovery-and-monitoring", "serverMonitoringMode", "poll waits after successful heartbeat");
434434
def.skipJira("https://jira.mongodb.org/browse/JAVA-4536")
435435
.file("server-discovery-and-monitoring", "interruptInUse");
436-
def.skipJira("https://jira.mongodb.org/browse/JAVA-5664")
437-
.file("server-discovery-and-monitoring", "pool-clear-application-error");
438-
def.skipJira("https://jira.mongodb.org/browse/JAVA-5664")
439-
.file("server-discovery-and-monitoring", "pool-clear-on-error-checkout");
440-
def.skipJira("https://jira.mongodb.org/browse/JAVA-5664")
441-
.file("server-discovery-and-monitoring", "pool-cleared-on-min-pool-size-population-error");
442436

443437
// session tests
444438
def.skipJira("https://jira.mongodb.org/browse/JAVA-5968")

0 commit comments

Comments
 (0)