Merge branch 'main' into JAVA-4586_bulk-write

stIncMale · stIncMale · commit c05816b21453 · 2024-11-27T15:09:09.000-07:00
diff --git a/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java b/driver-core/src/test/functional/com/mongodb/internal/operation/AsyncCommandBatchCursorTest.java
@@ -196,6 +196,7 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
     }
 
     @Test
+    @SuppressWarnings("try")
     void closeShouldResetTimeoutContextToDefaultMaxTime() {
         long maxTimeMS = 10;
         com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());
diff --git a/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java b/driver-core/src/test/unit/com/mongodb/internal/operation/CommandBatchCursorTest.java
@@ -179,6 +179,7 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {
     }
 
     @Test
+    @SuppressWarnings("try")
     void closeShouldResetTimeoutContextToDefaultMaxTime() {
         long maxTimeMS = 10;
         com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`@Test`
	`199`	`+ @SuppressWarnings("try")`
`199`	`200`	`void closeShouldResetTimeoutContextToDefaultMaxTime() {`
`200`	`201`	`long maxTimeMS = 10;`
`201`	`202`	`com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());`
Original file line number	Diff line number	Diff line change
`@@ -179,6 +179,7 @@ void shouldSkipKillsCursorsCommandWhenTimeoutExceptionHaveNetworkErrorCause() {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Test`
	`182`	`+ @SuppressWarnings("try")`
`182`	`183`	`void closeShouldResetTimeoutContextToDefaultMaxTime() {`
`183`	`184`	`long maxTimeMS = 10;`
`184`	`185`	`com.mongodb.assertions.Assertions.assertTrue(maxTimeMS < TIMEOUT.toMillis());`