From 9d6720266f3bf6e57739fc1380b0fedca63e17e9 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Fri, 6 Dec 2024 15:01:44 +0200 Subject: [PATCH] Added support for different version schemes depending on the provider (2) (#2125) Signed-off-by: Avgustin Marinov --- .../repository/jpa/management/DeploymentManagementTest.java | 6 ++++-- .../jpa/management/SoftwareModuleManagementTest.java | 3 ++- .../repository/jpa/management/TargetTagManagementTest.java | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java index d3ab371c2..c18b42d96 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java @@ -1360,7 +1360,8 @@ class DeploymentManagementTest extends AbstractJpaIntegrationTest { // checking the revisions of the created entities // verifying that the revision of the object and the revision within the // DB has incremented by implicit lock - assertThat(dsA.getOptLockRevision()).as("lock revision is wrong") + assertThat(dsA.getOptLockRevision()) + .as("lock revision is wrong") .isEqualTo(distributionSetManagement.getWithDetails(dsA.getId()).get().getOptLockRevision()); // verifying that the assignment is correct @@ -1422,7 +1423,8 @@ class DeploymentManagementTest extends AbstractJpaIntegrationTest { testdataFactory.createDistributionSet("b"); final Target targ = testdataFactory.createTarget("target-id-A"); - assertThat(dsA.getOptLockRevision()).as("lock revision is wrong") + assertThat(dsA.getOptLockRevision()) + .as("lock revision is wrong") .isEqualTo(distributionSetManagement.getWithDetails(dsA.getId()).get().getOptLockRevision()); assignDistributionSet(dsA, Collections.singletonList(targ)); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleManagementTest.java index 9b2a5e915..c9827204a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/SoftwareModuleManagementTest.java @@ -157,7 +157,8 @@ public class SoftwareModuleManagementTest extends AbstractJpaIntegrationTest { final SoftwareModule updated = softwareModuleManagement .update(entityFactory.softwareModule().update(ah.getId()).description("changed").vendor("changed")); - assertThat(updated.getOptLockRevision()).as("Expected version number of updated entitity is") + assertThat(updated.getOptLockRevision()) + .as("Expected version number of updated entitity is") .isEqualTo(ah.getOptLockRevision() + 1); assertThat(updated.getDescription()).as("Updated description is").isEqualTo("changed"); assertThat(updated.getVendor()).as("Updated vendor is").isEqualTo("changed"); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTagManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTagManagementTest.java index cd28df9db..716ab0b2b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTagManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/TargetTagManagementTest.java @@ -214,7 +214,8 @@ class TargetTagManagementTest extends AbstractJpaIntegrationTest { assertThat(targetTagRepository.findById(savedAssigned.getId()).get().getName()).as("wrong target tag is saved") .isEqualTo("test123"); assertThat(targetTagRepository.findById(savedAssigned.getId()).get().getOptLockRevision()) - .as("wrong target tag is saved").isEqualTo(2); + .as("wrong target tag is saved") + .isEqualTo(version(2)); } @Test