[#1651] Fix tag config - case insensitive (test) (#1681)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
eclipse · Mar 8, 2024 · 8b3a6f0 · 8b3a6f0
1 parent 936e6d6
commit 8b3a6f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java b/...main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java
@@ -832,7 +832,7 @@ boolean isImplicitLockApplicable(final DistributionSet distributionSet) {
 
         final List<String> skipForTags = repositoryProperties.getSkipImplicitLockForTags();
         if (!ObjectUtils.isEmpty(skipForTags)) {
-            final Set<DistributionSetTag> tags = ((JpaDistributionSet)jpaDistributionSet).getTags();
+            final Set<DistributionSetTag> tags = jpaDistributionSet.getTags();
             if (!ObjectUtils.isEmpty(tags)) {
                 for (final DistributionSetTag tag : tags) {
                     if (skipForTags.contains(tag.getName())) {

diff --git a/...est/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java b/...est/java/org/eclipse/hawkbit/repository/jpa/management/DistributionSetManagementTest.java
@@ -1069,7 +1069,7 @@ void lockDistributionSetApplied() {
     @Autowired RepositoryProperties repositoryProperties;
     @Test
     @Description("Test implicit locks for a DS and skip tags.")
-    void isImplicitLockApplicableDistributionSet() {
+    void isImplicitLockApplicableForDistributionSet() {
         final JpaDistributionSetManagement distributionSetManagement =
                 (JpaDistributionSetManagement)this.distributionSetManagement;
         final DistributionSet distributionSet = testdataFactory.createDistributionSet("ds-non-skip");
@@ -1079,6 +1079,10 @@ void isImplicitLockApplicableDistributionSet() {
         assertThat(repositoryProperties.getSkipImplicitLockForTags().size()).isNotEqualTo(0);
         final List<DistributionSetTag> skipTags = distributionSetTagManagement.create(
             repositoryProperties.getSkipImplicitLockForTags().stream()
+                    .map(String::toLowerCase)
+                    // remove same in case-insensitive terms tags
+                    // in of case-insensitive db's it will end up as same names and constraint violation (?)
+                    .distinct()
                     .map(skipTag -> entityFactory.tag().create().name(skipTag))
                     .toList());
         // assert that implicit lock locks for every skip tag