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 c5f16d2790d KAFKA-18087 Revert unnecessary integration testing of both
consumer group protocols (#22331)
c5f16d2790d is described below
commit c5f16d2790d36641fa05a9f0c9f1bb7a6046e2b0
Author: Murali Basani <[email protected]>
AuthorDate: Fri May 22 06:42:17 2026 +0200
KAFKA-18087 Revert unnecessary integration testing of both consumer group
protocols (#22331)
In TransactionsTest, there are several duplicate tests which are not
really required to run for CONSUMER group protocol, as they are using
consumer to subscribe, assign and poll which is protocol agnostic path
Reviewers: PoAn Yang <[email protected]>, Ken Huang
<[email protected]>, Chia-Ping Tsai <[email protected]>
---
.../storage/integration/TransactionsTest.java | 82 +++-------------------
1 file changed, 11 insertions(+), 71 deletions(-)
diff --git
a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsTest.java
b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsTest.java
index 12a1fe4e20f..d0c285caecd 100644
---
a/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsTest.java
+++
b/storage/src/test/java/org/apache/kafka/tiered/storage/integration/TransactionsTest.java
@@ -61,37 +61,19 @@ public class TransactionsTest {
}
@ClusterTest
- public void testClassicBasicTransactions() throws Exception {
- TransactionsTestHelper.testBasicTransactions(
- clusterInstance, GroupProtocol.CLASSIC,
TransactionsTestHelper.NO_OP_HOOKS, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncBasicTransactions() throws Exception {
+ public void testBasicTransactions() throws Exception {
TransactionsTestHelper.testBasicTransactions(
clusterInstance, GroupProtocol.CONSUMER,
TransactionsTestHelper.NO_OP_HOOKS, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicReadCommittedConsumerShouldNotSeeUndecidedData()
throws Exception {
-
TransactionsTestHelper.testReadCommittedConsumerShouldNotSeeUndecidedData(
- clusterInstance, GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncReadCommittedConsumerShouldNotSeeUndecidedData()
throws Exception {
+ public void testReadCommittedConsumerShouldNotSeeUndecidedData() throws
Exception {
TransactionsTestHelper.testReadCommittedConsumerShouldNotSeeUndecidedData(
clusterInstance, GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicDelayedFetchIncludesAbortedTransaction() throws
Exception {
- TransactionsTestHelper.testDelayedFetchIncludesAbortedTransaction(
- clusterInstance, GroupProtocol.CLASSIC,
TransactionsTestHelper.NO_OP_HOOKS, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncDelayedFetchIncludesAbortedTransaction() throws
Exception {
+ public void testDelayedFetchIncludesAbortedTransaction() throws Exception {
TransactionsTestHelper.testDelayedFetchIncludesAbortedTransaction(
clusterInstance, GroupProtocol.CONSUMER,
TransactionsTestHelper.NO_OP_HOOKS, TOPIC_CONFIG);
}
@@ -109,22 +91,12 @@ public class TransactionsTest {
}
@ClusterTest
- public void testClassicFencingOnCommit() throws Exception {
- TransactionsTestHelper.testFencingOnCommit(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncFencingOnCommit() throws Exception {
+ public void testFencingOnCommit() throws Exception {
TransactionsTestHelper.testFencingOnCommit(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicFencingOnSendOffsets() throws Exception {
- TransactionsTestHelper.testFencingOnSendOffsets(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncFencingOnSendOffsets() throws Exception {
+ public void testFencingOnSendOffsets() throws Exception {
TransactionsTestHelper.testFencingOnSendOffsets(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@@ -161,42 +133,22 @@ public class TransactionsTest {
}
@ClusterTest
- public void testClassicFencingOnSend() throws Exception {
- TransactionsTestHelper.testFencingOnSend(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncFencingOnSend() throws Exception {
+ public void testFencingOnSend() throws Exception {
TransactionsTestHelper.testFencingOnSend(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicFencingOnAddPartitions() throws Exception {
- TransactionsTestHelper.testFencingOnAddPartitions(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncFencingOnAddPartitions() throws Exception {
+ public void testFencingOnAddPartitions() throws Exception {
TransactionsTestHelper.testFencingOnAddPartitions(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicFencingOnTransactionExpiration() throws Exception {
-
TransactionsTestHelper.testFencingOnTransactionExpiration(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncFencingOnTransactionExpiration() throws Exception {
+ public void testFencingOnTransactionExpiration() throws Exception {
TransactionsTestHelper.testFencingOnTransactionExpiration(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest
- public void testClassicMultipleMarkersOneLeader() throws Exception {
- TransactionsTestHelper.testMultipleMarkersOneLeader(clusterInstance,
GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest
- public void testAsyncMultipleMarkersOneLeader() throws Exception {
+ public void testMultipleMarkersOneLeader() throws Exception {
TransactionsTestHelper.testMultipleMarkersOneLeader(clusterInstance,
GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@@ -211,25 +163,13 @@ public class TransactionsTest {
}
@ClusterTest(features = {@ClusterFeature(feature =
Feature.TRANSACTION_VERSION, version = 1)})
- public void testClassicBumpTransactionalEpochWithTV2Disabled() throws
Exception {
- TransactionsTestHelper.testBumpTransactionalEpochWithTV2Disabled(
- clusterInstance, GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest(features = {@ClusterFeature(feature =
Feature.TRANSACTION_VERSION, version = 1)})
- public void testAsyncBumpTransactionalEpochWithTV2Disabled() throws
Exception {
+ public void testBumpTransactionalEpochWithTV2Disabled() throws Exception {
TransactionsTestHelper.testBumpTransactionalEpochWithTV2Disabled(
clusterInstance, GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
@ClusterTest(features = {@ClusterFeature(feature =
Feature.TRANSACTION_VERSION, version = 2)})
- public void testClassicBumpTransactionalEpochWithTV2Enabled() throws
Exception {
- TransactionsTestHelper.testBumpTransactionalEpochWithTV2Enabled(
- clusterInstance, GroupProtocol.CLASSIC, TOPIC_CONFIG);
- }
-
- @ClusterTest(features = {@ClusterFeature(feature =
Feature.TRANSACTION_VERSION, version = 2)})
- public void testAsyncBumpTransactionalEpochWithTV2Enabled() throws
Exception {
+ public void testBumpTransactionalEpochWithTV2Enabled() throws Exception {
TransactionsTestHelper.testBumpTransactionalEpochWithTV2Enabled(
clusterInstance, GroupProtocol.CONSUMER, TOPIC_CONFIG);
}
