KAFKA-17194 Don't create cluster for MetadataQuorumCommandTest#testCo…

…mmandConfig (#16682) Reviewers: TengYao Chi <[email protected]>, Chia-Ping Tsai <[email protected]>
apache · Jul 29, 2024 · 4e69bc0 · 4e69bc0
1 parent fdee225
commit 4e69bc0
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java b/tools/src/test/java/org/apache/kafka/tools/MetadataQuorumCommandTest.java
@@ -26,6 +26,7 @@
 import org.apache.kafka.common.errors.UnsupportedVersionException;
 import org.apache.kafka.test.TestUtils;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.io.File;
@@ -45,11 +46,6 @@
 @ExtendWith(value = ClusterTestExtensions.class)
 class MetadataQuorumCommandTest {
 
-    private final ClusterInstance cluster;
-    public MetadataQuorumCommandTest(ClusterInstance cluster) {
-        this.cluster = cluster;
-    }
-
     /**
      * 1. The same number of broker controllers
      * 2. More brokers than controllers
@@ -60,7 +56,7 @@ public MetadataQuorumCommandTest(ClusterInstance cluster) {
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 2, controllers = 1),
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 1, controllers = 2),
     })
-    public void testDescribeQuorumReplicationSuccessful() throws InterruptedException {
+    public void testDescribeQuorumReplicationSuccessful(ClusterInstance cluster) throws InterruptedException {
         cluster.waitForReadyBrokers();
         String describeOutput = ToolsTestUtils.captureStandardOut(() ->
             MetadataQuorumCommand.mainNoExit("--bootstrap-server", cluster.bootstrapServers(), "describe", "--replication")
@@ -87,7 +83,6 @@ public void testDescribeQuorumReplicationSuccessful() throws InterruptedExceptio
             assertEquals(cluster.config().numBrokers(), outputs.stream().filter(o -> observerPattern.matcher(o).find()).count());
     }
 
-
     /**
      * 1. The same number of broker controllers
      * 2. More brokers than controllers
@@ -98,7 +93,7 @@ public void testDescribeQuorumReplicationSuccessful() throws InterruptedExceptio
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 2, controllers = 1),
         @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT}, brokers = 1, controllers = 2),
     })
-    public void testDescribeQuorumStatusSuccessful() throws InterruptedException {
+    public void testDescribeQuorumStatusSuccessful(ClusterInstance cluster) throws InterruptedException {
         cluster.waitForReadyBrokers();
         String describeOutput = ToolsTestUtils.captureStandardOut(
             () -> MetadataQuorumCommand.mainNoExit(
@@ -134,7 +129,7 @@ public void testDescribeQuorumStatusSuccessful() throws InterruptedException {
     }
 
     @ClusterTest(types = {Type.KRAFT, Type.CO_KRAFT})
-    public void testOnlyOneBrokerAndOneController() {
+    public void testOnlyOneBrokerAndOneController(ClusterInstance cluster) {
         String statusOutput = ToolsTestUtils.captureStandardOut(() ->
             MetadataQuorumCommand.mainNoExit("--bootstrap-server", cluster.bootstrapServers(), "describe", "--status")
         );
@@ -147,16 +142,16 @@ public void testOnlyOneBrokerAndOneController() {
         assertEquals("0", replicationOutput.split("\n")[1].split("\\s+")[2]);
     }
 
-    @ClusterTest(types = {Type.CO_KRAFT})
+    @Test
     public void testCommandConfig() throws IOException {
         // specifying a --command-config containing properties that would prevent login must fail
         File tmpfile = TestUtils.tempFile(AdminClientConfig.SECURITY_PROTOCOL_CONFIG + "=SSL_PLAINTEXT");
-        assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", cluster.bootstrapServers(),
+        assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", "localhost:9092",
                         "--command-config", tmpfile.getAbsolutePath(), "describe", "--status"));
     }
 
     @ClusterTest(types = {Type.ZK})
-    public void testDescribeQuorumInZkMode() {
+    public void testDescribeQuorumInZkMode(ClusterInstance cluster) {
         assertInstanceOf(UnsupportedVersionException.class, assertThrows(
                 ExecutionException.class,
                 () -> MetadataQuorumCommand.execute("--bootstrap-server", cluster.bootstrapServers(), "describe", "--status")
@@ -166,11 +161,10 @@ public void testDescribeQuorumInZkMode() {
                 ExecutionException.class,
                 () -> MetadataQuorumCommand.execute("--bootstrap-server", cluster.bootstrapServers(), "describe", "--replication")
         ).getCause());
-
     }
 
     @ClusterTest(types = {Type.CO_KRAFT})
-    public void testHumanReadableOutput() {
+    public void testHumanReadableOutput(ClusterInstance cluster) {
         assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", cluster.bootstrapServers(), "describe", "--human-readable"));
         assertEquals(1, MetadataQuorumCommand.mainNoExit("--bootstrap-server", cluster.bootstrapServers(), "describe", "--status", "--human-readable"));
         String out0 = ToolsTestUtils.captureStandardOut(() ->