This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9292a226065 KAFKA-19049 Remove the
`@ExtendWith(ClusterTestExtensions.class)` from code base (#19299)
9292a226065 is described below
commit 9292a226065a5e9ab01178e686096754c145fd99
Author: Nick Guo <[email protected]>
AuthorDate: Sat Mar 29 02:15:16 2025 +0800
KAFKA-19049 Remove the `@ExtendWith(ClusterTestExtensions.class)` from code
base (#19299)
jira: https://issues.apache.org/jira/browse/KAFKA-19049
[KAFKA-18617](https://issues.apache.org/jira/browse/KAFKA-18617)
introduced the mechanism to inject the cluster test at runtime, so the
integration tests don't need to use
`@ExtendWith(ClusterTestExtensions.class)` any more.
Reviewers: PoAn Yang <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
.../apache/kafka/clients/admin/DescribeAuthorizedOperationsTest.java | 4 ----
.../java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java | 4 ----
.../java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java | 4 ----
.../src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala | 3 ---
.../org/apache/kafka/common/test/junit/ClusterTestExtensions.java | 1 -
.../org/apache/kafka/common/test/junit/ClusterTestBeforeEachTest.java | 2 --
6 files changed, 18 deletions(-)
diff --git
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeAuthorizedOperationsTest.java
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeAuthorizedOperationsTest.java
index c68218d52be..d4ad50a8f74 100644
---
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeAuthorizedOperationsTest.java
+++
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/DescribeAuthorizedOperationsTest.java
@@ -36,12 +36,9 @@ import org.apache.kafka.common.test.JaasUtils;
import org.apache.kafka.common.test.api.ClusterConfig;
import org.apache.kafka.common.test.api.ClusterTemplate;
import org.apache.kafka.common.test.api.Type;
-import org.apache.kafka.common.test.junit.ClusterTestExtensions;
import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
import org.apache.kafka.security.authorizer.AclEntry;
-import org.junit.jupiter.api.extension.ExtendWith;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -57,7 +54,6 @@ import static
org.apache.kafka.common.acl.AclPermissionType.ALLOW;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-@ExtendWith(ClusterTestExtensions.class)
public class DescribeAuthorizedOperationsTest {
private static final String GROUP1 = "group1";
private static final String GROUP2 = "group2";
diff --git
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java
index 9e56e6bd3e6..58240c0711e 100644
---
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java
+++
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/admin/StaticBrokerConfigTest.java
@@ -23,11 +23,8 @@ import org.apache.kafka.common.test.ClusterInstance;
import org.apache.kafka.common.test.api.ClusterConfigProperty;
import org.apache.kafka.common.test.api.ClusterTest;
import org.apache.kafka.common.test.api.Type;
-import org.apache.kafka.common.test.junit.ClusterTestExtensions;
import org.apache.kafka.coordinator.group.GroupCoordinatorConfig;
-import org.junit.jupiter.api.extension.ExtendWith;
-
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutionException;
@@ -35,7 +32,6 @@ import java.util.concurrent.ExecutionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-@ExtendWith(value = ClusterTestExtensions.class)
public class StaticBrokerConfigTest {
private static final String TOPIC = "topic";
private static final String CUSTOM_VALUE = "1048576";
diff --git
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java
index 0e4d4f76a42..e602ae081d7 100644
---
a/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java
+++
b/clients/clients-integration-tests/src/test/java/org/apache/kafka/server/quota/CustomQuotaCallbackTest.java
@@ -26,11 +26,8 @@ import
org.apache.kafka.common.test.api.ClusterConfigProperty;
import org.apache.kafka.common.test.api.ClusterTest;
import org.apache.kafka.common.test.api.ClusterTestDefaults;
import org.apache.kafka.common.test.api.Type;
-import org.apache.kafka.common.test.junit.ClusterTestExtensions;
import org.apache.kafka.server.config.QuotaConfig;
-import org.junit.jupiter.api.extension.ExtendWith;
-
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -44,7 +41,6 @@ import java.util.concurrent.atomic.AtomicInteger;
@ClusterConfigProperty(id = 3002, key =
QuotaConfig.CLIENT_QUOTA_CALLBACK_CLASS_CONFIG, value =
"org.apache.kafka.server.quota.CustomQuotaCallbackTest$CustomQuotaCallback"),
}
)
-@ExtendWith(ClusterTestExtensions.class)
public class CustomQuotaCallbackTest {
private final ClusterInstance cluster;
diff --git
a/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala
b/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala
index 7f1f8b6aae3..711598306f4 100644
--- a/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala
+++ b/core/src/test/scala/unit/kafka/server/SaslApiVersionsRequestTest.scala
@@ -22,15 +22,12 @@ import
org.apache.kafka.common.requests.{ApiVersionsRequest, ApiVersionsResponse
import org.apache.kafka.common.security.auth.SecurityProtocol
import org.apache.kafka.common.test.api.{ClusterTest, Type}
import org.apache.kafka.common.test.ClusterInstance
-import org.apache.kafka.common.test.junit.ClusterTestExtensions
import org.junit.jupiter.api.Assertions._
-import org.junit.jupiter.api.extension.ExtendWith
import java.net.Socket
import java.util.Collections
import scala.jdk.CollectionConverters._
-@ExtendWith(value = Array(classOf[ClusterTestExtensions]))
class SaslApiVersionsRequestTest(cluster: ClusterInstance) extends
AbstractApiVersionsRequestTest(cluster) {
@ClusterTest(types = Array(Type.KRAFT),
diff --git
a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/junit/ClusterTestExtensions.java
b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/junit/ClusterTestExtensions.java
index 2e705176463..05f79208d14 100644
---
a/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/junit/ClusterTestExtensions.java
+++
b/test-common/test-common-runtime/src/main/java/org/apache/kafka/common/test/junit/ClusterTestExtensions.java
@@ -78,7 +78,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
* For example:
*
* <pre>
- * @ExtendWith(value = Array(classOf[ClusterTestExtensions]))
* class SomeIntegrationTest {
* @ClusterTest(brokers = 1, controllers = 1, clusterType =
ClusterType.Both)
* def someTest(): Unit = {
diff --git
a/test-common/test-common-runtime/src/test/java/org/apache/kafka/common/test/junit/ClusterTestBeforeEachTest.java
b/test-common/test-common-runtime/src/test/java/org/apache/kafka/common/test/junit/ClusterTestBeforeEachTest.java
index 32fadf3cc65..8207fb7f1aa 100644
---
a/test-common/test-common-runtime/src/test/java/org/apache/kafka/common/test/junit/ClusterTestBeforeEachTest.java
+++
b/test-common/test-common-runtime/src/test/java/org/apache/kafka/common/test/junit/ClusterTestBeforeEachTest.java
@@ -22,13 +22,11 @@ import org.apache.kafka.common.test.api.AutoStart;
import org.apache.kafka.common.test.api.ClusterTest;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-@ExtendWith(ClusterTestExtensions.class)
public class ClusterTestBeforeEachTest {
private final ClusterInstance clusterInstance;
