fix GeoRepIntegTest close

heesung-sn · Nov 2, 2024 · 6889aaf · 6889aaf
1 parent e7369a9
commit 6889aaf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
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
@@ -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/...essaging/NonPersistentTopicMessaging.java → ...ging/NonPersistentTopicMessagingTest.java b/...essaging/NonPersistentTopicMessaging.java → ...ging/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/...n/messaging/PersistentTopicMessaging.java → ...ssaging/PersistentTopicMessagingTest.java b/...n/messaging/PersistentTopicMessaging.java → ...ssaging/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
@@ -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>