root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

KAFKA-16918 TestUtils#assertFutureThrows should use future.get with timeout (#18891) 

Reviewers: TengYao Chi <kitingiao@gmail.com>, Luke Chen <showuon@gmail.com>, Parker Chang <45290853+Parkerhiphop@users.noreply.github.com>, Chia-Ping Tsai <chia7712@gmail.com>
This commit is contained in:
Ken Huang 2025-02-20 07:22:31 +08:00 committed by GitHub
parent 9f23b25f6e
commit eda8fc84ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
clients/src/test/java/org/apache/kafka/test/TestUtils.java
View File

@ -64,8 +64,11 @@ import java.util.Properties;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -75,7 +78,6 @@ import java.util.stream.Collectors;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.fail;
@ -580,8 +582,8 @@ public class TestUtils {
} }
/** /**
* Assert that a future raises an expected exception cause type. Return the exception cause * Assert that a future raises an expected exception cause type.
* if the assertion succeeds; otherwise raise AssertionError. * This method will wait for the future to complete or timeout(15000 milliseconds).
* *
* @param <T> Exception cause type parameter * @param <T> Exception cause type parameter
* @param exceptionCauseClass Class of the expected exception cause * @param exceptionCauseClass Class of the expected exception cause
@ -589,15 +591,25 @@ public class TestUtils {
* @return The caught exception cause * @return The caught exception cause
*/ */
public static <T extends Throwable> T assertFutureThrows(Class<T> exceptionCauseClass, Future<?> future) { public static <T extends Throwable> T assertFutureThrows(Class<T> exceptionCauseClass, Future<?> future) {
ExecutionException exception = assertThrows(ExecutionException.class, future::get); try {
Throwable cause = exception.getCause(); future.get(DEFAULT_MAX_WAIT_MS, TimeUnit.MILLISECONDS);
fail("Should throw expected exception " + exceptionCauseClass.getSimpleName() + " but nothing was thrown.");
// Enable strict type checking. } catch (InterruptedException | ExecutionException | CancellationException e) {
// This ensures we're testing for the exact exception type, not its subclasses. Throwable cause = e instanceof ExecutionException ? e.getCause() : e;
assertEquals(exceptionCauseClass, cause.getClass(), // Enable strict type checking.
"Expected a " + exceptionCauseClass.getSimpleName() + " exception, but got " + // This ensures we're testing for the exact exception type, not its subclasses.
cause.getClass().getSimpleName()); assertEquals(
return exceptionCauseClass.cast(exception.getCause()); exceptionCauseClass,
cause.getClass(),
"Expected " + exceptionCauseClass.getSimpleName() + ", but got " + cause.getClass().getSimpleName()
);
return exceptionCauseClass.cast(cause);
} catch (TimeoutException e) {
fail("Future is not completed within " + DEFAULT_MAX_WAIT_MS + " milliseconds.");
} catch (Exception e) {
fail("Expected " + exceptionCauseClass.getSimpleName() + ", but got " + e.getClass().getSimpleName());
}
return null;
} }
public static <T extends Throwable> void assertFutureThrows( public static <T extends Throwable> void assertFutureThrows(