From 6889aafb0deaf58e1cc14e1272f4cc6c43fe5d32 Mon Sep 17 00:00:00 2001
From: Heesung Sohn <heesung.sohn@streamnative.io>
Date: Fri, 1 Nov 2024 18:57:02 -0700
Subject: [PATCH] fix GeoRepIntegTest close

---
 .../pulsar/tests/integration/GeoRepIntegTest.java     |  2 +-
 ...ging.java => NonPersistentTopicMessagingTest.java} |  2 +-
 ...ssaging.java => PersistentTopicMessagingTest.java} |  2 +-
 .../src/test/resources/pulsar-messaging.xml           | 11 +++++------
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/{NonPersistentTopicMessaging.java => NonPersistentTopicMessagingTest.java} (97%)
 rename tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/{PersistentTopicMessaging.java => PersistentTopicMessagingTest.java} (97%)

diff --git a/pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/GeoRepIntegTest.java b/pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/GeoRepIntegTest.java
index e052c19fc68d4..b23100d67972a 100644
--- a/pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/GeoRepIntegTest.java
+++ b/pulsar-inttest-client/src/main/java/org/apache/pulsar/tests/integration/GeoRepIntegTest.java
@@ -37,8 +37,8 @@ public GeoRepIntegTest(PulsarClient clientA, PulsarAdmin adminA, PulsarClient cl
 
     public void close() throws IOException {
         clientA.close();
+        clientB.close();
         adminA.close();
         adminB.close();
-        adminB.close();
     }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessaging.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
similarity index 97%
rename from tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessaging.java
rename to tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
index 3897a3f234c65..17486e4627ba0 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessaging.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/NonPersistentTopicMessagingTest.java
@@ -24,7 +24,7 @@
 import org.testng.annotations.Test;
 
 @Slf4j
-public class NonPersistentTopicMessaging extends MessagingBase {
+public class NonPersistentTopicMessagingTest extends MessagingBase {
 
     TopicMessaging test;
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessaging.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
similarity index 97%
rename from tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessaging.java
rename to tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
index 8b0e994230ffb..2de06acf737b1 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessaging.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/PersistentTopicMessagingTest.java
@@ -24,7 +24,7 @@
 import org.testng.annotations.Test;
 
 @Slf4j
-public class PersistentTopicMessaging extends MessagingBase {
+public class PersistentTopicMessagingTest extends MessagingBase {
 
     TopicMessaging test;
 
diff --git a/tests/integration/src/test/resources/pulsar-messaging.xml b/tests/integration/src/test/resources/pulsar-messaging.xml
index 51474fa4001f4..0169ce61cd05e 100644
--- a/tests/integration/src/test/resources/pulsar-messaging.xml
+++ b/tests/integration/src/test/resources/pulsar-messaging.xml
@@ -22,15 +22,14 @@
 <suite name="Pulsar (Messaging) Integration Tests" verbose="2" annotations="JDK">
     <test name="messaging-test-suite" preserve-order="true">
         <classes>
-            <class name="org.apache.pulsar.tests.integration.messaging.PersistentTopicMessaging" />
-            <class name="org.apache.pulsar.tests.integration.messaging.NonPersistentTopicMessaging" />
-            <class name="org.apache.pulsar.tests.integration.messaging.GeoReplication" />
+            <class name="org.apache.pulsar.tests.integration.messaging.PersistentTopicMessagingTest" />
+            <class name="org.apache.pulsar.tests.integration.messaging.NonPersistentTopicMessagingTest" />
+            <class name="org.apache.pulsar.tests.integration.messaging.GeoReplicationTest" />
             <class name="org.apache.pulsar.tests.integration.messaging.DelayMessagingTest" />
-            <class name="org.apache.pulsar.tests.integration.messaging.ReaderMessaging" />
-            <class name="org.apache.pulsar.tests.integration.messaging.NonDurableConsumerMessaging" />
+            <class name="org.apache.pulsar.tests.integration.messaging.ReaderMessagingTest" />
+            <class name="org.apache.pulsar.tests.integration.messaging.NonDurableConsumerMessagingTest" />
             <class name="org.apache.pulsar.tests.integration.messaging.MessagingSmokeTest" />
             <class name="org.apache.pulsar.tests.integration.admin.AdminTest" />
-
             <class name="org.apache.pulsar.tests.integration.oxia.OxiaSmokeTest" />
         </classes>
     </test>