From 07a89f62b354a4b4f7e157977bcdc7a6014a4390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=8D=C3=B1igo=20Cobi=C3=A1n?= Date: Thu, 30 Jan 2025 17:16:02 +0100 Subject: [PATCH] Update S3RegionResolverTest Added mock for Monitor --- klab.engine/pom.xml | 6 ++++++ .../klab/test/utils/S3RegionResolverTest.java | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/klab.engine/pom.xml b/klab.engine/pom.xml index 97ee32ba0..23bd0e480 100644 --- a/klab.engine/pom.xml +++ b/klab.engine/pom.xml @@ -960,6 +960,12 @@ ${junit5.version} test + + org.mockito + mockito-core + ${mockito.version} + test + apache-client diff --git a/klab.engine/src/test/java/org/integratedmodelling/klab/test/utils/S3RegionResolverTest.java b/klab.engine/src/test/java/org/integratedmodelling/klab/test/utils/S3RegionResolverTest.java index c784a2c85..38ab3ae3a 100644 --- a/klab.engine/src/test/java/org/integratedmodelling/klab/test/utils/S3RegionResolverTest.java +++ b/klab.engine/src/test/java/org/integratedmodelling/klab/test/utils/S3RegionResolverTest.java @@ -1,20 +1,22 @@ package org.integratedmodelling.klab.test.utils; +import org.integratedmodelling.klab.api.runtime.monitoring.IMonitor; import org.integratedmodelling.klab.exceptions.KlabResourceAccessException; import org.integratedmodelling.klab.utils.s3.S3RegionResolver; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import software.amazon.awssdk.regions.Region; public class S3RegionResolverTest { - @Test public void resolveBucketRegion_resolutionSuccessful() { String bucket = "deafrica-input-datasets"; String objectKey = "rainfall_chirps_monthly/chirps-v2.0_2024.03.tif"; + IMonitor monitor = Mockito.mock(IMonitor.class); - Region ret = S3RegionResolver.resolveBucketRegion(bucket, objectKey); + Region ret = S3RegionResolver.resolveBucketRegion(bucket, objectKey, monitor); Assertions.assertEquals(Region.AF_SOUTH_1, ret); } @@ -24,9 +26,10 @@ public void resolveBucketRegion_resolutionSuccessful() { public void resolveBucketRegion_resolutionUnsuccessful() { String bucket = "fake-bucket"; String objectKey = "fake-object.tif"; + IMonitor monitor = Mockito.mock(IMonitor.class); Assertions.assertThrows(KlabResourceAccessException.class, () -> { - S3RegionResolver.resolveBucketRegion(bucket, objectKey); + S3RegionResolver.resolveBucketRegion(bucket, objectKey, monitor); }); }