From 3ee042447c9617a26e01653683b910e5d3f48dac Mon Sep 17 00:00:00 2001
From: Vasil Ilchev <vasil.ilchev@bosch.io>
Date: Fri, 31 Oct 2025 09:09:21 +0200
Subject: [PATCH] Fix RolloutManagementTest (#2790)

Co-authored-by: vasilchev <vasil.ilchev@bosch.com>
---
 .../jpa/management/RolloutManagementTest.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementTest.java
index a4700d060..984d11785 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/RolloutManagementTest.java
@@ -12,7 +12,6 @@ package org.eclipse.hawkbit.repository.jpa.management;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -61,6 +60,7 @@ import org.eclipse.hawkbit.repository.exception.RolloutIllegalStateException;
 import org.eclipse.hawkbit.repository.jpa.AbstractJpaIntegrationTest;
 import org.eclipse.hawkbit.repository.jpa.model.JpaAction;
 import org.eclipse.hawkbit.repository.jpa.model.JpaRollout;
+import org.eclipse.hawkbit.repository.jpa.model.JpaRolloutGroup;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.ActionStatusCreate;
 import org.eclipse.hawkbit.repository.model.Action.ActionType;
@@ -1865,11 +1865,18 @@ class RolloutManagementTest extends AbstractJpaIntegrationTest {
         final int amountTargetsForRollout = 10;
         final int amountOtherTargets = 15;
         final int amountGroups = 5;
+        final int amountTargetsPerGroup = amountTargetsForRollout / amountGroups;
         final String successCondition = "50";
         final String errorCondition = "80";
         final Rollout createdRollout = testdataFactory.createSimpleTestRolloutWithTargetsAndDistributionSet(
                 amountTargetsForRollout,
                 amountOtherTargets, amountGroups, successCondition, errorCondition);
+        final Page<JpaRolloutGroup> rolloutGroups = rolloutGroupRepository.findByRolloutId(createdRollout.getId(), PAGE);
+        assertThat(rolloutGroups.getTotalElements()).isEqualTo(amountGroups);
+
+        for (JpaRolloutGroup group : rolloutGroups) {
+            assertThat(rolloutTargetGroupRepository.countByRolloutGroup(group)).isEqualTo(amountTargetsPerGroup);
+        }
 
         // test
         rolloutManagement.delete(createdRollout.getId());
@@ -1879,8 +1886,10 @@ class RolloutManagementTest extends AbstractJpaIntegrationTest {
         final Optional<JpaRollout> deletedRollout = rolloutRepository.findById(createdRollout.getId());
         assertThat(deletedRollout).isNotPresent();
         assertThat(rolloutGroupRepository.countByRolloutId(createdRollout.getId())).isZero();
-        await().atMost(Duration.ofSeconds(10)).pollInterval(Duration.ofSeconds(1))
-                .until(() -> rolloutTargetGroupRepository.count() == 0);
+
+        for (JpaRolloutGroup group : rolloutGroups) {
+            assertThat(rolloutTargetGroupRepository.countByRolloutGroup(group)).isZero();
+        }
     }
 
     @Test