From 91f5f17ae4eba6baaa03b8f28b7a80902c1a43cb Mon Sep 17 00:00:00 2001
From: Xiangying Meng <55571188+liangyepianzhou@users.noreply.github.com>
Date: Mon, 26 Feb 2024 15:02:47 +0800
Subject: [PATCH] [fix][test] fix test testSyncNormalPositionWhenTBRecover

---
 .../buffer/TransactionStablePositionTest.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java
index b3bd2ec466057..2fdfd3a524750 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/buffer/TransactionStablePositionTest.java
@@ -217,14 +217,14 @@ public void testSyncNormalPositionWhenTBRecover(boolean clientEnableTransaction,
         position = topicTransactionBuffer.getMaxReadPosition();
         assertEquals(position, PositionImpl.EARLIEST);
 
+        // change to None state can recover
+        field.set(topicTransactionBuffer, TopicTransactionBufferState.State.None);
+
         // invoke recover
         Method method = TopicTransactionBuffer.class.getDeclaredMethod("recover");
         method.setAccessible(true);
         method.invoke(topicTransactionBuffer);
 
-        // change to None state can recover
-        field.set(topicTransactionBuffer, TopicTransactionBufferState.State.None);
-
         // recover success again
         checkTopicTransactionBufferState(clientEnableTransaction, topicTransactionBuffer);
 
@@ -236,13 +236,15 @@ public void testSyncNormalPositionWhenTBRecover(boolean clientEnableTransaction,
     private void checkTopicTransactionBufferState(boolean clientEnableTransaction,
                                                   TopicTransactionBuffer topicTransactionBuffer) {
         // recover success
-        Awaitility.await().until(() -> {
+        Awaitility.await().untilAsserted(() -> {
             if (clientEnableTransaction) {
                 // recover success, client enable transaction will change to Ready State
-                return topicTransactionBuffer.getStats(false, false).state.equals(Ready.name());
+                assertEquals(topicTransactionBuffer.getStats(false, false).state,
+                        Ready.name());
             } else {
                 // recover success, client disable transaction will change to NoSnapshot State
-                return topicTransactionBuffer.getStats(false, false).state.equals(NoSnapshot.name());
+                assertEquals(topicTransactionBuffer.getStats(false, false).state,
+                        NoSnapshot.name());
             }
         });
     }