From 1003d8548f3c5a02d906e81f62aa886521878d29 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Thu, 12 Feb 2026 12:15:32 +0200
Subject: [PATCH] Fix flaky tests in TenantProfileControllerTest

---
 .../server/controller/AbstractWebTest.java      |  1 +
 .../controller/TenantProfileControllerTest.java | 17 ++++++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 71cbed6d10..eb053cff76 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -430,6 +430,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         tenantProfileService.deleteTenantProfiles(TenantId.SYS_TENANT_ID);
 
         jdbcTemplate.execute("TRUNCATE TABLE notification");
+        jdbcTemplate.execute("TRUNCATE TABLE audit_log");
 
         log.debug("Executed web test teardown");
     }
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
index 2454dae974..a2e622c8b5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
@@ -407,20 +407,15 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
         testBroadcastEntityStateChangeEventNeverTenantProfile();
     }
 
-    private void awaitAuditLog(String awaitMessage, TenantProfileId tenantProfileId, ActionType expectedAction) throws Exception {
+    private void awaitAuditLog(String awaitMessage, TenantProfileId tenantProfileId, ActionType expectedAction) {
         Awaitility.await(awaitMessage)
                 .atMost(TIMEOUT, TimeUnit.SECONDS)
-                .until(() ->
-                        doGetTypedWithTimePageLink(
-                                "/api/audit/logs/entity/TENANT_PROFILE/" + tenantProfileId.getId() + "?",
-                                new TypeReference<PageData<AuditLog>>() {
-                                },
-                                new TimePageLink(5))
-                                .getData()
-                                .stream()
-                                .anyMatch(log -> log.getActionType() == expectedAction)
+                .until(() -> doGetTypedWithTimePageLink(
+                        "/api/audit/logs?",
+                        new TypeReference<PageData<AuditLog>>() {},
+                        new TimePageLink(100)).getData().stream()
+                        .anyMatch(log -> log.getEntityId().equals(tenantProfileId) && log.getActionType() == expectedAction)
                 );
-
     }
 
     private TenantProfile createTenantProfile(String name) {