From 0e5f1d6526ab6d4fe10f07edff70a0e71e82d478 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Wed, 3 Sep 2025 09:29:37 +0300 Subject: [PATCH] Fix ArtifactStorage availability in tests (#2644) After renaming of LocalArtifactRepository to ArtifactRepository Signed-off-by: Avgustin Marinov --- .../jpa/management/ArtifactManagementTest.java | 16 ++++++++-------- .../jpa/management/ManagementSecurityTest.java | 2 +- .../management/SoftwareModuleManagementTest.java | 4 ++-- .../repository/test/TestConfiguration.java | 2 +- .../test/util/AbstractIntegrationTest.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java index 90defeb1c..3826efd47 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ArtifactManagementTest.java @@ -253,8 +253,8 @@ class ArtifactManagementTest extends AbstractJpaIntegrationTest { assertThat(artifact1.getSha1Hash()).isNotEqualTo(artifact2.getSha1Hash()); final String currentTenant = tenantAware.getCurrentTenant(); - assertThat(binaryArtifactRepository.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); - assertThat(binaryArtifactRepository.getBySha1(currentTenant, artifact2.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(currentTenant, artifact2.getSha1Hash())).isNotNull(); artifactManagement.delete(artifact1.getId()); @@ -262,14 +262,14 @@ class ArtifactManagementTest extends AbstractJpaIntegrationTest { final String sha1Hash = artifact1.getSha1Hash(); assertThatExceptionOfType(ArtifactBinaryNotFoundException.class) - .isThrownBy(() -> binaryArtifactRepository.getBySha1(currentTenant, sha1Hash)); + .isThrownBy(() -> artifactStorage.getBySha1(currentTenant, sha1Hash)); - assertThat(binaryArtifactRepository.getBySha1(currentTenant, artifact2.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(currentTenant, artifact2.getSha1Hash())).isNotNull(); artifactManagement.delete(artifact2.getId()); final String sha1Hash2 = artifact2.getSha1Hash(); assertThatExceptionOfType(ArtifactBinaryNotFoundException.class) - .isThrownBy(() -> binaryArtifactRepository.getBySha1(currentTenant, sha1Hash2)); + .isThrownBy(() -> artifactStorage.getBySha1(currentTenant, sha1Hash2)); assertThat(artifactRepository.findAll()).isEmpty(); } @@ -297,17 +297,17 @@ class ArtifactManagementTest extends AbstractJpaIntegrationTest { assertThat((artifact1).getSha1Hash()).isEqualTo(artifact2.getSha1Hash()); assertThat(artifactRepository.findAll()).hasSize(2); final String currentTenant = tenantAware.getCurrentTenant(); - assertThat(binaryArtifactRepository.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); artifactManagement.delete(artifact1.getId()); assertThat(artifactRepository.existsById(artifact1.getId())).isFalse(); assertThat(artifactRepository.findAll()).hasSize(1); - assertThat(binaryArtifactRepository.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(currentTenant, artifact1.getSha1Hash())).isNotNull(); artifactManagement.delete(artifact2.getId()); final String sha1Hash = artifact1.getSha1Hash(); assertThatExceptionOfType(ArtifactBinaryNotFoundException.class) - .isThrownBy(() -> binaryArtifactRepository.getBySha1(currentTenant, sha1Hash)); + .isThrownBy(() -> artifactStorage.getBySha1(currentTenant, sha1Hash)); assertThat(artifactRepository.findAll()).isEmpty(); } } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ManagementSecurityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ManagementSecurityTest.java index e83e0c3f3..8899543af 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ManagementSecurityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/ManagementSecurityTest.java @@ -76,7 +76,7 @@ class ManagementSecurityTest extends AbstractJpaIntegrationTest { @Override @BeforeEach - public void beforeAll() throws Exception { + public void beforeAll() { // override - shall not do anything } 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 45625f76f..f95a21714 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 @@ -453,7 +453,7 @@ class SoftwareModuleManagementTest assertThat(artifactRepository.findAll()).hasSize(results.length); for (final Artifact result : results) { assertThat(result.getId()).isNotNull(); - assertThat(binaryArtifactRepository.getBySha1(tenantAware.getCurrentTenant(), result.getSha1Hash())).isNotNull(); + assertThat(artifactStorage.getBySha1(tenantAware.getCurrentTenant(), result.getSha1Hash())).isNotNull(); } } @@ -462,7 +462,7 @@ class SoftwareModuleManagementTest final String currentTenant = tenantAware.getCurrentTenant(); final String sha1Hash = result.getSha1Hash(); assertThatExceptionOfType(ArtifactBinaryNotFoundException.class) - .isThrownBy(() -> binaryArtifactRepository.getBySha1(currentTenant, sha1Hash)); + .isThrownBy(() -> artifactStorage.getBySha1(currentTenant, sha1Hash)); } } } \ No newline at end of file diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java index ff7806317..0a8601e72 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java @@ -123,7 +123,7 @@ public class TestConfiguration implements AsyncConfigurer { } @Bean - ArtifactStorage artifactRepository(final FileArtifactProperties artifactFilesystemProperties) { + ArtifactStorage artifactStorage(final FileArtifactProperties artifactFilesystemProperties) { return new FileArtifactStorage(artifactFilesystemProperties); } diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java index 27674c1e4..fad390583 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java @@ -178,7 +178,7 @@ public abstract class AbstractIntegrationTest { @Autowired protected SystemSecurityContext systemSecurityContext; @Autowired - protected ArtifactStorage binaryArtifactRepository; + protected ArtifactStorage artifactStorage; @Autowired protected QuotaManagement quotaManagement;