From ebc3755469ba9d29dc5572773b1f67d44deec8ac Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 10 Oct 2025 12:58:59 +0300 Subject: [PATCH] Fix ACM tests (#2739) Signed-off-by: Avgustin Marinov --- .../repository/jpa/acm/SoftwareModuleManagementTest.java | 4 ++-- .../hawkbit/repository/jpa/acm/TargetManagementTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/SoftwareModuleManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/SoftwareModuleManagementTest.java index 7572f0a45..202897b28 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/SoftwareModuleManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/SoftwareModuleManagementTest.java @@ -39,11 +39,11 @@ class SoftwareModuleManagementTest extends AbstractAccessControllerManagementTes Assertions. assertThat(softwareModuleManagement.findByRsql("name==*", UNPAGED)).containsExactly(sm1Type1); Assertions.assertThat(softwareModuleManagement.countByRsql("name==*")).isEqualTo(1); - final Long sm2Type2Id = sm2Type2.getId(); - Assertions. assertThat(softwareModuleManagement.findByAssignedTo(sm2Type2Id, UNPAGED).toList()) + Assertions. assertThat(softwareModuleManagement.findByAssignedTo(ds2Type2.getId(), UNPAGED).toList()) .containsExactly(sm1Type1); // no sm2Type2 assertThat(softwareModuleManagement.getMetadata(sm1Type1.getId())).isEmpty(); + final Long sm2Type2Id = sm2Type2.getId(); assertThatExceptionOfType(EntityNotFoundException.class).isThrownBy(() -> softwareModuleManagement.getMetadata(sm2Type2Id)); }); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java index 3e17047d1..4a6a5269f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/acm/TargetManagementTest.java @@ -117,10 +117,10 @@ class TargetManagementTest extends AbstractAccessControllerManagementTest { .isInstanceOf(InsufficientPermissionException.class); // find by tags - assertThat(targetManagement.findByTag(targetType2.getId(), UNPAGED)) + assertThat(targetManagement.findByTag(targetTag2.getId(), UNPAGED)) .extracting(Identifiable::getId) .containsOnly(target1Type1.getId()); - assertThat(targetManagement.findByRsqlAndTag("id==*", targetType2.getId(), UNPAGED)) + assertThat(targetManagement.findByRsqlAndTag("id==*", targetTag2.getId(), UNPAGED)) .extracting(Identifiable::getId) .containsOnly(target1Type1.getId()); });