From ba8d9af3629c8c937c051081773f78a9bac39a52 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Fri, 24 Apr 2026 16:06:23 +0300
Subject: [PATCH] Improve SSL reload test assertions

---
 .../transport/mqtt/MqttSslHandlerProviderTest.java    |  7 +++++--
 .../service/CertificateReloadManagerTest.java         | 11 ++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProviderTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProviderTest.java
index 8c4f3c7a29..9b4ce007f8 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProviderTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/MqttSslHandlerProviderTest.java
@@ -33,6 +33,8 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -119,13 +121,13 @@ public class MqttSslHandlerProviderTest {
 
         CountDownLatch startLatch = new CountDownLatch(1);
         CountDownLatch doneLatch = new CountDownLatch(5);
+        List<SslHandler> handlers = new CopyOnWriteArrayList<>();
 
         for (int i = 0; i < 5; i++) {
             new Thread(() -> {
                 try {
                     startLatch.await();
-                    SslHandler handler = sslHandlerProvider.getSslHandler();
-                    assertThat(handler).isNotNull();
+                    handlers.add(sslHandlerProvider.getSslHandler());
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 } finally {
@@ -138,6 +140,7 @@ public class MqttSslHandlerProviderTest {
         boolean completed = doneLatch.await(5, TimeUnit.SECONDS);
 
         assertThat(completed).isTrue();
+        assertThat(handlers).hasSize(5).allSatisfy(h -> assertThat(h).isNotNull());
         // Concurrent handshakes read the same pre-built context without the old sync bottleneck.
         SSLContext contextAfter = (SSLContext) ReflectionTestUtils.getField(sslHandlerProvider, "sslContext");
         assertThat(contextAfter).isSameAs(contextBefore);
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/CertificateReloadManagerTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/CertificateReloadManagerTest.java
index 3156897210..6f78eaefae 100644
--- a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/CertificateReloadManagerTest.java
+++ b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/CertificateReloadManagerTest.java
@@ -24,7 +24,10 @@ import org.springframework.test.util.ReflectionTestUtils;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.attribute.FileTime;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -99,6 +102,9 @@ public class CertificateReloadManagerTest {
 
         certificateReloadManager.registerWatcher("test-cert", certFile, reloadCount::incrementAndGet);
 
+        long bumpedMtime = Files.getLastModifiedTime(certFile).toMillis() + 5_000L;
+        Files.setLastModifiedTime(certFile, FileTime.fromMillis(bumpedMtime));
+
         ReflectionTestUtils.invokeMethod(certificateReloadManager, "checkCertificates");
 
         assertThat(reloadCount.get()).isEqualTo(0);
@@ -120,10 +126,13 @@ public class CertificateReloadManagerTest {
     @Test
     public void givenWatcherRegistered_whenShutdown_thenShouldStopScheduler() throws Exception {
         certificateReloadManager.registerWatcher("test-cert", certFile, () -> {});
+        ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+        ReflectionTestUtils.setField(certificateReloadManager, "scheduler", scheduler);
 
         certificateReloadManager.destroy();
 
-        assertThat(certificateReloadManager).isNotNull();
+        assertThat(scheduler.isShutdown()).isTrue();
+        assertThat(scheduler.isTerminated()).isTrue();
     }
 
     @Test