From 253b36113d32ef4ac294e28187b2c541785d1aab Mon Sep 17 00:00:00 2001 From: "Chung, Ming-Yen" Date: Wed, 24 Jul 2024 19:29:34 +0800 Subject: [PATCH] KAFKA-17179 Remove integration tag in class level when using ClusterTestExtensions (#16656) Reviewers: Chia-Ping Tsai --- .../test/java/kafka/admin/ConfigCommandIntegrationTest.java | 2 -- core/src/test/java/kafka/server/LogManagerIntegrationTest.java | 2 -- .../kafka/server/KafkaServerKRaftRegistrationTest.scala | 3 +-- .../unit/kafka/server/AllocateProducerIdsRequestTest.scala | 3 +-- .../unit/kafka/server/BrokerRegistrationRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/ClientQuotasRequestTest.scala | 2 -- .../unit/kafka/server/ConsumerGroupDescribeRequestsTest.scala | 3 +-- .../unit/kafka/server/ConsumerGroupHeartbeatRequestTest.scala | 3 +-- .../unit/kafka/server/ConsumerProtocolMigrationTest.scala | 2 -- .../test/scala/unit/kafka/server/DeleteGroupsRequestTest.scala | 3 +-- .../scala/unit/kafka/server/DescribeGroupsRequestTest.scala | 3 +-- .../scala/unit/kafka/server/DescribeQuorumRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/HeartbeatRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/JoinGroupRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/LeaveGroupRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/ListGroupsRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/OffsetCommitRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/OffsetDeleteRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/OffsetFetchRequestTest.scala | 3 +-- .../test/scala/unit/kafka/server/SyncGroupRequestTest.scala | 3 +-- .../remote/metadata/storage/RemoteLogSegmentLifecycleTest.java | 2 -- ...BasedRemoteLogMetadataManagerMultipleSubscriptionsTest.java | 2 -- .../storage/TopicBasedRemoteLogMetadataManagerRestartTest.java | 2 -- .../log/remote/storage/RemoteLogMetadataManagerTest.java | 2 -- .../java/org/apache/kafka/tools/DeleteRecordsCommandTest.java | 2 -- .../test/java/org/apache/kafka/tools/FeatureCommandTest.java | 2 -- .../test/java/org/apache/kafka/tools/GetOffsetShellTest.java | 2 -- .../java/org/apache/kafka/tools/LeaderElectionCommandTest.java | 2 -- .../java/org/apache/kafka/tools/MetadataQuorumCommandTest.java | 2 -- .../DeleteOffsetsConsumerGroupCommandIntegrationTest.java | 2 -- .../kafka/tools/consumer/group/DescribeConsumerGroupTest.java | 2 -- .../kafka/tools/consumer/group/ListConsumerGroupTest.java | 2 -- 32 files changed, 16 insertions(+), 64 deletions(-) diff --git a/core/src/test/java/kafka/admin/ConfigCommandIntegrationTest.java b/core/src/test/java/kafka/admin/ConfigCommandIntegrationTest.java index 045a9377f67..e666fb8c7ac 100644 --- a/core/src/test/java/kafka/admin/ConfigCommandIntegrationTest.java +++ b/core/src/test/java/kafka/admin/ConfigCommandIntegrationTest.java @@ -39,7 +39,6 @@ import org.apache.kafka.server.common.MetadataVersion; import org.apache.kafka.server.config.ZooKeeperInternals; import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.platform.commons.util.StringUtils; @@ -75,7 +74,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") public class ConfigCommandIntegrationTest { private List alterOpts; diff --git a/core/src/test/java/kafka/server/LogManagerIntegrationTest.java b/core/src/test/java/kafka/server/LogManagerIntegrationTest.java index de9a5f51267..e3e551fa8a1 100644 --- a/core/src/test/java/kafka/server/LogManagerIntegrationTest.java +++ b/core/src/test/java/kafka/server/LogManagerIntegrationTest.java @@ -40,7 +40,6 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.storage.internals.checkpoint.PartitionMetadataFile; import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.io.IOException; @@ -60,7 +59,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") public class LogManagerIntegrationTest { private final ClusterInstance cluster; diff --git a/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala b/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala index 0ebb63db18c..adcb24a3b49 100644 --- a/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala +++ b/core/src/test/scala/integration/kafka/server/KafkaServerKRaftRegistrationTest.scala @@ -27,8 +27,8 @@ import org.apache.kafka.raft.QuorumConfig import org.apache.kafka.server.common.MetadataVersion import org.apache.kafka.server.config.{KRaftConfigs, ZkConfigs} import org.junit.jupiter.api.Assertions.{assertThrows, fail} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith -import org.junit.jupiter.api.{Tag, Timeout} import java.util.Optional import java.util.concurrent.{TimeUnit, TimeoutException} @@ -42,7 +42,6 @@ import scala.jdk.CollectionConverters._ * of just the broker registration path. */ @Timeout(120) -@Tag("integration") @ExtendWith(value = Array(classOf[ClusterTestExtensions])) class KafkaServerKRaftRegistrationTest { diff --git a/core/src/test/scala/unit/kafka/server/AllocateProducerIdsRequestTest.scala b/core/src/test/scala/unit/kafka/server/AllocateProducerIdsRequestTest.scala index ad5c1eacb59..28e17ab349a 100644 --- a/core/src/test/scala/unit/kafka/server/AllocateProducerIdsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/AllocateProducerIdsRequestTest.scala @@ -27,13 +27,12 @@ import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests._ import org.apache.kafka.server.common.ProducerIdsBlock import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith -import org.junit.jupiter.api.{Tag, Timeout} @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class AllocateProducerIdsRequestTest(cluster: ClusterInstance) { @ClusterTest diff --git a/core/src/test/scala/unit/kafka/server/BrokerRegistrationRequestTest.scala b/core/src/test/scala/unit/kafka/server/BrokerRegistrationRequestTest.scala index 575c611072f..247973255b2 100644 --- a/core/src/test/scala/unit/kafka/server/BrokerRegistrationRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/BrokerRegistrationRequestTest.scala @@ -34,8 +34,8 @@ import org.apache.kafka.common.{Node, Uuid} import org.apache.kafka.server.{ControllerRequestCompletionHandler, NodeToControllerChannelManager} import org.apache.kafka.server.common.MetadataVersion import org.junit.jupiter.api.Assertions.{assertEquals, assertThrows} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith -import org.junit.jupiter.api.{Tag, Timeout} import java.util.concurrent.{CompletableFuture, TimeUnit, TimeoutException} @@ -43,7 +43,6 @@ import java.util.concurrent.{CompletableFuture, TimeUnit, TimeoutException} * This test simulates a broker registering with the KRaft quorum under different configurations. */ @Timeout(120) -@Tag("integration") @ExtendWith(value = Array(classOf[ClusterTestExtensions])) class BrokerRegistrationRequestTest { diff --git a/core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala b/core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala index 8954c89ed27..3ac2d7c6814 100644 --- a/core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/ClientQuotasRequestTest.scala @@ -31,13 +31,11 @@ import org.apache.kafka.common.quota.{ClientQuotaAlteration, ClientQuotaEntity, import org.apache.kafka.common.requests.{AlterClientQuotasRequest, AlterClientQuotasResponse, DescribeClientQuotasRequest, DescribeClientQuotasResponse} import org.apache.kafka.server.config.{QuotaConfigs, ZooKeeperInternals} import org.junit.jupiter.api.Assertions._ -import org.junit.jupiter.api.Tag import org.junit.jupiter.api.extension.ExtendWith import scala.jdk.CollectionConverters._ @ExtendWith(value = Array(classOf[ClusterTestExtensions])) -@Tag("integration") class ClientQuotasRequestTest(cluster: ClusterInstance) { @ClusterTest def testAlterClientQuotasRequest(): Unit = { diff --git a/core/src/test/scala/unit/kafka/server/ConsumerGroupDescribeRequestsTest.scala b/core/src/test/scala/unit/kafka/server/ConsumerGroupDescribeRequestsTest.scala index a4f9f171475..3d7a3c87ecd 100644 --- a/core/src/test/scala/unit/kafka/server/ConsumerGroupDescribeRequestsTest.scala +++ b/core/src/test/scala/unit/kafka/server/ConsumerGroupDescribeRequestsTest.scala @@ -29,8 +29,8 @@ import org.apache.kafka.common.resource.ResourceType import org.apache.kafka.common.utils.Utils import org.apache.kafka.security.authorizer.AclEntry import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith -import org.junit.jupiter.api.{Tag, Timeout} import java.lang.{Byte => JByte} import scala.jdk.CollectionConverters._ @@ -38,7 +38,6 @@ import scala.jdk.CollectionConverters._ @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT), brokers = 1) -@Tag("integration") class ConsumerGroupDescribeRequestsTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(types = Array(Type.ZK)) diff --git a/core/src/test/scala/unit/kafka/server/ConsumerGroupHeartbeatRequestTest.scala b/core/src/test/scala/unit/kafka/server/ConsumerGroupHeartbeatRequestTest.scala index 4616e90a4bd..f2076c1b8e9 100644 --- a/core/src/test/scala/unit/kafka/server/ConsumerGroupHeartbeatRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/ConsumerGroupHeartbeatRequestTest.scala @@ -25,14 +25,13 @@ import org.apache.kafka.common.message.{ConsumerGroupHeartbeatRequestData, Consu import org.apache.kafka.common.protocol.Errors import org.apache.kafka.common.requests.{ConsumerGroupHeartbeatRequest, ConsumerGroupHeartbeatResponse} import org.junit.jupiter.api.Assertions.{assertEquals, assertNotEquals, assertNotNull} -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import scala.jdk.CollectionConverters._ @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) -@Tag("integration") class ConsumerGroupHeartbeatRequestTest(cluster: ClusterInstance) { @ClusterTest() diff --git a/core/src/test/scala/unit/kafka/server/ConsumerProtocolMigrationTest.scala b/core/src/test/scala/unit/kafka/server/ConsumerProtocolMigrationTest.scala index 658f80376c5..7a8f5f9d09c 100644 --- a/core/src/test/scala/unit/kafka/server/ConsumerProtocolMigrationTest.scala +++ b/core/src/test/scala/unit/kafka/server/ConsumerProtocolMigrationTest.scala @@ -25,14 +25,12 @@ import org.apache.kafka.coordinator.group.Group import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.apache.kafka.coordinator.group.modern.consumer.ConsumerGroup.ConsumerGroupState import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class ConsumerProtocolMigrationTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( serverProperties = Array( diff --git a/core/src/test/scala/unit/kafka/server/DeleteGroupsRequestTest.scala b/core/src/test/scala/unit/kafka/server/DeleteGroupsRequestTest.scala index 932200539b7..94d719e6f29 100644 --- a/core/src/test/scala/unit/kafka/server/DeleteGroupsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/DeleteGroupsRequestTest.scala @@ -23,13 +23,12 @@ import org.apache.kafka.common.message.DescribeGroupsResponseData.DescribedGroup import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.junit.jupiter.api.Assertions.{assertEquals, fail} -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class DeleteGroupsRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( serverProperties = Array( diff --git a/core/src/test/scala/unit/kafka/server/DescribeGroupsRequestTest.scala b/core/src/test/scala/unit/kafka/server/DescribeGroupsRequestTest.scala index a18f5e62c67..d6d4d8ba813 100644 --- a/core/src/test/scala/unit/kafka/server/DescribeGroupsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/DescribeGroupsRequestTest.scala @@ -23,7 +23,7 @@ import org.apache.kafka.common.message.DescribeGroupsResponseData.{DescribedGrou import org.apache.kafka.common.protocol.ApiKeys import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import scala.jdk.CollectionConverters._ @@ -31,7 +31,6 @@ import scala.jdk.CollectionConverters._ @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class DescribeGroupsRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(serverProperties = Array( new ClusterConfigProperty(key = "group.coordinator.rebalance.protocols", value = "classic,consumer"), diff --git a/core/src/test/scala/unit/kafka/server/DescribeQuorumRequestTest.scala b/core/src/test/scala/unit/kafka/server/DescribeQuorumRequestTest.scala index 622dcf366a1..292cfdab7e3 100644 --- a/core/src/test/scala/unit/kafka/server/DescribeQuorumRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/DescribeQuorumRequestTest.scala @@ -24,7 +24,7 @@ import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.DescribeQuorumRequest.singletonRequest import org.apache.kafka.common.requests.{AbstractRequest, AbstractResponse, ApiVersionsRequest, ApiVersionsResponse, DescribeQuorumRequest, DescribeQuorumResponse} import org.junit.jupiter.api.Assertions._ -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import scala.jdk.CollectionConverters._ @@ -33,7 +33,6 @@ import scala.reflect.ClassTag @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class DescribeQuorumRequestTest(cluster: ClusterInstance) { @ClusterTest(types = Array(Type.ZK)) diff --git a/core/src/test/scala/unit/kafka/server/HeartbeatRequestTest.scala b/core/src/test/scala/unit/kafka/server/HeartbeatRequestTest.scala index 02f6e2dae84..f03d4b7debb 100644 --- a/core/src/test/scala/unit/kafka/server/HeartbeatRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/HeartbeatRequestTest.scala @@ -25,7 +25,7 @@ import org.apache.kafka.clients.consumer.internals.ConsumerProtocol import org.apache.kafka.common.message.SyncGroupRequestData import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.coordinator.group.classic.ClassicGroupState -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import java.util.Collections @@ -35,7 +35,6 @@ import scala.concurrent.Future @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class HeartbeatRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(serverProperties = Array( new ClusterConfigProperty(key = "group.coordinator.rebalance.protocols", value = "classic,consumer"), diff --git a/core/src/test/scala/unit/kafka/server/JoinGroupRequestTest.scala b/core/src/test/scala/unit/kafka/server/JoinGroupRequestTest.scala index f626fa98794..5ce99c41202 100644 --- a/core/src/test/scala/unit/kafka/server/JoinGroupRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/JoinGroupRequestTest.scala @@ -27,7 +27,7 @@ import org.apache.kafka.common.message.{JoinGroupResponseData, SyncGroupRequestD import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import java.util.Collections @@ -38,7 +38,6 @@ import scala.jdk.CollectionConverters._ @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) -@Tag("integration") class JoinGroupRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(types = Array(Type.KRAFT), serverProperties = Array( new ClusterConfigProperty(key = "group.coordinator.new.enable", value = "true"), diff --git a/core/src/test/scala/unit/kafka/server/LeaveGroupRequestTest.scala b/core/src/test/scala/unit/kafka/server/LeaveGroupRequestTest.scala index 47e67e543f6..ddcba33063e 100644 --- a/core/src/test/scala/unit/kafka/server/LeaveGroupRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/LeaveGroupRequestTest.scala @@ -23,13 +23,12 @@ import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.common.requests.JoinGroupRequest import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class LeaveGroupRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(serverProperties = Array( new ClusterConfigProperty(key = "group.coordinator.rebalance.protocols", value = "classic,consumer"), diff --git a/core/src/test/scala/unit/kafka/server/ListGroupsRequestTest.scala b/core/src/test/scala/unit/kafka/server/ListGroupsRequestTest.scala index c1a562f1105..dc96fc4390b 100644 --- a/core/src/test/scala/unit/kafka/server/ListGroupsRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/ListGroupsRequestTest.scala @@ -25,13 +25,12 @@ import org.apache.kafka.coordinator.group.classic.ClassicGroupState import org.apache.kafka.coordinator.group.modern.consumer.ConsumerGroup.ConsumerGroupState import org.apache.kafka.coordinator.group.Group import org.junit.jupiter.api.Assertions.{assertEquals, fail} -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class ListGroupsRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( serverProperties = Array( diff --git a/core/src/test/scala/unit/kafka/server/OffsetCommitRequestTest.scala b/core/src/test/scala/unit/kafka/server/OffsetCommitRequestTest.scala index 70ebc652f50..5ba9f18249b 100644 --- a/core/src/test/scala/unit/kafka/server/OffsetCommitRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/OffsetCommitRequestTest.scala @@ -21,13 +21,12 @@ import kafka.test.annotation.{ClusterConfigProperty, ClusterTest, ClusterTestDef import kafka.test.junit.ClusterTestExtensions import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.junit.jupiter.api.Assertions.fail -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class OffsetCommitRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( diff --git a/core/src/test/scala/unit/kafka/server/OffsetDeleteRequestTest.scala b/core/src/test/scala/unit/kafka/server/OffsetDeleteRequestTest.scala index 0eaa465c61e..ec9d4c779f2 100644 --- a/core/src/test/scala/unit/kafka/server/OffsetDeleteRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/OffsetDeleteRequestTest.scala @@ -21,13 +21,12 @@ import kafka.test.annotation.{ClusterConfigProperty, ClusterTest, ClusterTestDef import kafka.test.junit.ClusterTestExtensions import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.junit.jupiter.api.Assertions.fail -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class OffsetDeleteRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( serverProperties = Array( diff --git a/core/src/test/scala/unit/kafka/server/OffsetFetchRequestTest.scala b/core/src/test/scala/unit/kafka/server/OffsetFetchRequestTest.scala index 943c314790a..67f5cfb5492 100644 --- a/core/src/test/scala/unit/kafka/server/OffsetFetchRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/OffsetFetchRequestTest.scala @@ -24,7 +24,7 @@ import org.apache.kafka.common.TopicPartition import org.apache.kafka.common.message.OffsetFetchResponseData import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.junit.jupiter.api.Assertions.{assertEquals, fail} -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import scala.jdk.CollectionConverters._ @@ -32,7 +32,6 @@ import scala.jdk.CollectionConverters._ @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class OffsetFetchRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest( diff --git a/core/src/test/scala/unit/kafka/server/SyncGroupRequestTest.scala b/core/src/test/scala/unit/kafka/server/SyncGroupRequestTest.scala index b958f03e67b..48b300852e9 100644 --- a/core/src/test/scala/unit/kafka/server/SyncGroupRequestTest.scala +++ b/core/src/test/scala/unit/kafka/server/SyncGroupRequestTest.scala @@ -25,7 +25,7 @@ import org.apache.kafka.clients.consumer.internals.ConsumerProtocol import org.apache.kafka.common.message.SyncGroupRequestData import org.apache.kafka.common.protocol.{ApiKeys, Errors} import org.apache.kafka.coordinator.group.classic.ClassicGroupState -import org.junit.jupiter.api.{Tag, Timeout} +import org.junit.jupiter.api.Timeout import org.junit.jupiter.api.extension.ExtendWith import java.util.Collections @@ -36,7 +36,6 @@ import scala.concurrent.{Await, Future} @Timeout(120) @ExtendWith(value = Array(classOf[ClusterTestExtensions])) @ClusterTestDefaults(types = Array(Type.KRAFT)) -@Tag("integration") class SyncGroupRequestTest(cluster: ClusterInstance) extends GroupCoordinatorBaseRequestTest(cluster) { @ClusterTest(serverProperties = Array( new ClusterConfigProperty(key = "group.coordinator.rebalance.protocols", value = "classic,consumer"), diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java index 849005a0446..0a36ef1b559 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/RemoteLogSegmentLifecycleTest.java @@ -34,7 +34,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteStorageException; import org.apache.kafka.storage.internals.log.EpochEntry; import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.util.Arrays; @@ -57,7 +56,6 @@ import static org.mockito.Mockito.verify; @ClusterTestDefaults(brokers = 3) @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") public class RemoteLogSegmentLifecycleTest { private final int segSize = 1048576; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest.java index 9100fa92750..55541d18a42 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest.java @@ -33,7 +33,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.server.log.remote.storage.RemoteStorageException; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.util.Arrays; @@ -54,7 +53,6 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -@Tag("integration") @ExtendWith(ClusterTestExtensions.class) @ClusterTestDefaults(brokers = 3) public class TopicBasedRemoteLogMetadataManagerMultipleSubscriptionsTest { diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java index 8bd3943eca7..4f95fac24d8 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/metadata/storage/TopicBasedRemoteLogMetadataManagerRestartTest.java @@ -30,7 +30,6 @@ import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentId; import org.apache.kafka.server.log.remote.storage.RemoteLogSegmentMetadata; import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.util.Arrays; @@ -40,7 +39,6 @@ import static org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemo import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") public class TopicBasedRemoteLogMetadataManagerRestartTest { private final Time time = Time.SYSTEM; diff --git a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManagerTest.java b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManagerTest.java index 501dca80490..6c3ed561600 100644 --- a/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManagerTest.java +++ b/storage/src/test/java/org/apache/kafka/server/log/remote/storage/RemoteLogMetadataManagerTest.java @@ -29,7 +29,6 @@ import org.apache.kafka.server.log.remote.metadata.storage.RemoteLogMetadataMana import org.apache.kafka.server.log.remote.metadata.storage.RemotePartitionMetadataStore; import org.apache.kafka.server.log.remote.metadata.storage.TopicBasedRemoteLogMetadataManager; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.util.Collections; @@ -46,7 +45,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -@Tag("integration") @ExtendWith(ClusterTestExtensions.class) @ClusterTestDefaults(brokers = 3) public class RemoteLogMetadataManagerTest { diff --git a/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java index 9a7a40c2c9f..66fa37f96fa 100644 --- a/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/DeleteRecordsCommandTest.java @@ -33,7 +33,6 @@ import org.apache.kafka.server.common.AdminOperationException; import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -50,7 +49,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") public class DeleteRecordsCommandTest { @ClusterTest diff --git a/tools/src/test/java/org/apache/kafka/tools/FeatureCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/FeatureCommandTest.java index 4b6671dbd90..48c08e20a96 100644 --- a/tools/src/test/java/org/apache/kafka/tools/FeatureCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/FeatureCommandTest.java @@ -26,7 +26,6 @@ import org.apache.kafka.server.common.MetadataVersion; import net.sourceforge.argparse4j.inf.Namespace; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -47,7 +46,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -@Tag("integration") @ExtendWith(value = ClusterTestExtensions.class) public class FeatureCommandTest { @ClusterTest(types = {Type.ZK}, metadataVersion = MetadataVersion.IBP_3_3_IV1) diff --git a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java index 45929d93e61..2d588c60257 100644 --- a/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/GetOffsetShellTest.java @@ -36,7 +36,6 @@ import org.apache.kafka.common.serialization.StringSerializer; import org.apache.kafka.common.utils.AppInfoParser; import org.apache.kafka.common.utils.Exit; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.time.Duration; @@ -59,7 +58,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @ClusterConfigProperty(key = "offsets.topic.replication.factor", value = "1"), @ClusterConfigProperty(key = "offsets.topic.num.partitions", value = "4") }) -@Tag("integration") public class GetOffsetShellTest { private final int topicCount = 4; private final ClusterInstance cluster; diff --git a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java index 4bfc1dc547e..674ddf38ec4 100644 --- a/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/LeaderElectionCommandTest.java @@ -31,7 +31,6 @@ import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.errors.UnknownTopicOrPartitionException; import org.apache.kafka.server.common.AdminCommandFailedException; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.MockedStatic; @@ -72,7 +71,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @ClusterConfigProperty(key = "controlled.shutdown.retry.backoff.ms", value = "1000"), @ClusterConfigProperty(key = "offsets.topic.replication.factor", value = "2") }) -@Tag("integration") public class LeaderElectionCommandTest { private final ClusterInstance cluster; int broker2 = 1; diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java index 710b0671c2f..501b3f1fd3c 100644 --- a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java @@ -26,7 +26,6 @@ import org.apache.kafka.clients.admin.AdminClientConfig; import org.apache.kafka.common.errors.UnsupportedVersionException; import org.apache.kafka.test.TestUtils; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; @@ -44,7 +43,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(value = ClusterTestExtensions.class) -@Tag("integration") class MetadataQuorumCommandTest { private final ClusterInstance cluster; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java index 66145659a3c..187bd7502d4 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DeleteOffsetsConsumerGroupCommandIntegrationTest.java @@ -40,7 +40,6 @@ import org.apache.kafka.common.serialization.ByteArraySerializer; import org.apache.kafka.coordinator.group.GroupCoordinatorConfig; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.extension.ExtendWith; import java.time.Duration; @@ -56,7 +55,6 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; -@Tag("integration") @ExtendWith(ClusterTestExtensions.class) public class DeleteOffsetsConsumerGroupCommandIntegrationTest { public static final String TOPIC_PREFIX = "foo."; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java index 9883dc471eb..32f86dab6b0 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/DescribeConsumerGroupTest.java @@ -41,7 +41,6 @@ import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -70,7 +69,6 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -@Tag("integration") @ExtendWith(value = ClusterTestExtensions.class) public class DescribeConsumerGroupTest { private static final String TOPIC_PREFIX = "test.topic."; diff --git a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java index d7e6c87431a..39dff2f6423 100644 --- a/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java +++ b/tools/src/test/java/org/apache/kafka/tools/consumer/group/ListConsumerGroupTest.java @@ -37,7 +37,6 @@ import org.apache.kafka.test.TestUtils; import org.apache.kafka.tools.ToolsTestUtils; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -67,7 +66,6 @@ import static org.apache.kafka.clients.consumer.ConsumerConfig.PARTITION_ASSIGNM import static org.apache.kafka.clients.consumer.ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG; import static org.apache.kafka.common.utils.Utils.mkSet; -@Tag("integration") @ExtendWith(ClusterTestExtensions.class) public class ListConsumerGroupTest { private static final String TOPIC_PREFIX = "test.topic.";