Reviewing files that changed from the base of the PR and between 1aa6eb2 and fd2790d.

• pom.xml (1 hunks)
• src/test/java/com/alipay/remoting/rpc/heartbeat/RuntimeClientHeartBeatTest.java (2 hunks)
• src/test/java/com/alipay/remoting/rpc/protocol/RpcCommandHandlerTest.java (5 hunks)

• GitHub Check: build (8)
• GitHub Check: build (11)
• GitHub Check: build (17)
• GitHub Check: build (21)

pom.xml (1)

137-148: Good addition of test libraries for improving test stability.

The addition of Awaitility and Mockito as test dependencies aligns perfectly with the PR's objective of making tests more stable. Awaitility (4.3.0) provides elegant ways to handle asynchronous conditions in tests, while Mockito (4.11.0) enables proper object mocking.

src/test/java/com/alipay/remoting/rpc/protocol/RpcCommandHandlerTest.java (7)

25-32: Good addition of necessary imports for mocking and concurrency utilities.

These imports support the enhanced testing approach using proper mocking and thread-safe collections.

---

41-42: Good adoption of Awaitility for asynchronous testing.

Using the static import for Awaitility makes the test code more readable by directly using the await() method.

---

51-51: Thread safety improvement with CopyOnWriteArrayList.

Excellent change from ArrayList to CopyOnWriteArrayList for remotingContextList, which addresses the potential race condition mentioned in the PR objectives. This thread-safe collection is optimized for scenarios with frequent reads and infrequent writes, making it perfect for test result collection.

---

57-66: Proper mocking implementation improves test realism.

The use of Mockito to create realistic ChannelHandlerContext and Channel mocks is a significant improvement over using null. This makes the test both more robust and more representative of real runtime conditions.

---

71-73: Good practice to clear test state before execution.

Explicitly clearing the remotingContextList before the test helps avoid false positives from previous test runs and ensures test isolation.

---

87-92: Excellent replacement of fixed waiting with Awaitility.

This change replaces what was likely a CountDownLatch with a more robust Awaitility waiting mechanism. The clear polling interval and timeout settings make the test more reliable and less prone to timing issues.

---

115-115: Improved assertion semantics.

Changed from assertNotNull to assertNotSame, which better reflects the intended test verification - ensuring we're working with a new context instance rather than just checking for non-null.

src/test/java/com/alipay/remoting/rpc/heartbeat/RuntimeClientHeartBeatTest.java (5)

39-42: Good imports for time handling and Awaitility.

These imports support the enhanced asynchronous testing approach.

---

100-115: Excellent refactoring of heartbeat verification with Awaitility.

The initial verification phase now uses Awaitility for a more reliable check that heartbeats are being sent. This replaces what was likely a static Thread.sleep followed by an assertion, providing a more robust way to handle the asynchronous nature of heartbeats.

---

116-117: Improved logging with parameterized messages.

Using parameterized logging is cleaner and more efficient than string concatenation.

---

118-135: Great implementation of heartbeat disable testing phase.

This section clearly separates test phases and uses Awaitility's during() method to verify that no heartbeats are received during the disabled period. The brief Thread.sleep is an appropriate choice to allow in-flight heartbeats to complete.

---

136-146: Well-structured re-enable phase with clear verification.

The final phase of the test cleanly resets the counter and uses Awaitility to verify heartbeats resume after re-enabling, making the test more reliable and less dependent on fixed timing.