From 0437e9009bbb27b421024f33fefe6c9bbc4f17e0 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Mon, 2 Feb 2026 10:21:08 +0200
Subject: [PATCH] fixed tests

---
 .../EntityAggregationCalculatedFieldTest.java | 11 +++++++--
 .../server/msa/cf/CalculatedFieldTest.java    | 24 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/cf/EntityAggregationCalculatedFieldTest.java b/application/src/test/java/org/thingsboard/server/cf/EntityAggregationCalculatedFieldTest.java
index 0872e21dae..c23c59d137 100644
--- a/application/src/test/java/org/thingsboard/server/cf/EntityAggregationCalculatedFieldTest.java
+++ b/application/src/test/java/org/thingsboard/server/cf/EntityAggregationCalculatedFieldTest.java
@@ -205,6 +205,15 @@ public class EntityAggregationCalculatedFieldTest extends AbstractControllerTest
         CustomInterval customInterval = new CustomInterval(TZ, 0L, 2L);
         createConsumptionCF(device.getId(), customInterval, null);
 
+        long interval = customInterval.getCurrentIntervalDurationMillis();
+
+        // Wait for a fresh interval
+        long initialIntervalStart = customInterval.getCurrentIntervalStartTs();
+        await().alias("wait for fresh interval")
+                .atMost(interval + 100, TimeUnit.MILLISECONDS)
+                .pollInterval(100, TimeUnit.MILLISECONDS)
+                .until(() -> customInterval.getCurrentIntervalStartTs() != initialIntervalStart);
+
         long currentIntervalStartTs = customInterval.getCurrentIntervalStartTs();
 
         long tsBeforeInterval = currentIntervalStartTs - 1000;
@@ -216,8 +225,6 @@ public class EntityAggregationCalculatedFieldTest extends AbstractControllerTest
         postTelemetry(device.getId(), String.format("{\"ts\": \"%s\", \"values\": {\"energy\":180}}", tsInInterval_2));
         postTelemetry(device.getId(), String.format("{\"ts\": \"%s\", \"values\": {\"energy\":120}}", tsInInterval_3));
 
-        long interval = customInterval.getCurrentIntervalDurationMillis();
-
         await().alias("create CF -> perform aggregation after interval end")
                 .atMost(2 * interval, TimeUnit.MILLISECONDS)
                 .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/cf/CalculatedFieldTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/cf/CalculatedFieldTest.java
index 4c5b228d3c..af4197d6ec 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/cf/CalculatedFieldTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/cf/CalculatedFieldTest.java
@@ -810,18 +810,27 @@ public class CalculatedFieldTest extends AbstractContainerTest {
         // --- Build CF: PROPAGATION ---
         CalculatedField saved = createPropagationCF(device.getId());
 
+        // Wait for INITIALIZED event
+        waitForDebugEvent(saved, CalculatedFieldEventType.INITIALIZED.name(), 1);
+
         // Create relations FROM asset 2 TO device
         Asset asset2 = testRestClient.postAsset(createAsset("Propagated Asset 2", null));
         EntityRelation rel2 = new EntityRelation(asset2.getId(), device.getId(), EntityRelation.CONTAINS_TYPE);
         testRestClient.postEntityRelation(rel2);
 
+        // Wait for RELATION_ADD_OR_UPDATE event
+        waitForDebugEvent(saved, CalculatedFieldEventType.RELATION_ADD_OR_UPDATE.name(), 2);
+
         // Telemetry on device
         testRestClient.postTelemetry(deviceToken, JacksonUtil.toJsonNode("{\"temperature\":25.1}"));
 
+        // Wait for POST_TELEMETRY_REQUEST event
+        waitForDebugEvent(saved, TbMsgType.POST_TELEMETRY_REQUEST.name(), 3);
+
         // Delete relation between asset 1 and device
         testRestClient.deleteEntityRelation(asset1.getId(), EntityRelation.CONTAINS_TYPE, device.getId());
 
-        // --- Assert propagated calculation (arguments-only mode) ---
+        // --- Assert all debug events in correct sequence ---
         await().alias("check debug events")
                 .atMost(TIMEOUT, TimeUnit.SECONDS)
                 .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
@@ -845,6 +854,19 @@ public class CalculatedFieldTest extends AbstractContainerTest {
         testRestClient.deleteAsset(asset2.getId());
     }
 
+    private void waitForDebugEvent(CalculatedField cf, String expectedEventType, int expectedTotalEvents) {
+        await().alias("wait for debug event: " + expectedEventType)
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    List<String> eventTypes = testRestClient.getEvents(cf.getId(), EventType.DEBUG_CALCULATED_FIELD, tenantId, new TimePageLink(expectedTotalEvents, 0, null, SortOrder.BY_CREATED_TIME_DESC)).getData().stream()
+                            .map(e -> e.getBody().get("msgType").asText())
+                            .toList();
+                    assertThat(eventTypes).hasSize(expectedTotalEvents);
+                    assertThat(eventTypes.get(0)).isEqualTo(expectedEventType);
+                });
+    }
+
     private CalculatedField createPropagationCF(EntityId entityId) {
         CalculatedField cf = new CalculatedField();
         cf.setEntityId(entityId);