feat(impl):[#225] Improve cache eviction test via Awaitility instead …

…of calling method directly in the test
eclipse-tractusx · Dec 8, 2023 · b10598a · b10598a
1 parent 82038db
commit b10598a
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/irs-api/src/test/java/org/eclipse/tractusx/irs/DiscoveryFinderClientTest.java b/irs-api/src/test/java/org/eclipse/tractusx/irs/DiscoveryFinderClientTest.java
@@ -29,6 +29,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -47,8 +48,10 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.web.client.RestTemplate;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
 
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK,
+                properties = "irs-edc-client.discoveryFinderClient.cacheTTL=PT0.1S")
 @ActiveProfiles(profiles = "test")
 @Import({ TestConfig.class })
 class DiscoveryFinderClientTest {
@@ -98,23 +101,20 @@ void findDiscoveryEndpoints_WhenCalled_ResultsShouldBeCached() {
     }
 
     @Test
-    void evictDiscoveryEndpointsCacheValues_WhenCalled_ShouldEvictCache() {
+    void evictDiscoveryEndpointsCacheValues_WhenScheduled_ShouldEvictCache() {
 
         // GIVEN
         final var request = new DiscoveryFinderRequest(List.of("bpn"));
         simulateFindDiscoveryEndpointsRestRequest(request, MOCKED_DISCOVERY_RESPONSE);
         testee.findDiscoveryEndpoints(request);
-        requireDiscoveryEndpointsCacheValue(request);
+        final var cache = getDiscoveryEndpointsCache();
+        assertThat(cache.get(request)).isNotNull();
 
         // WHEN
-        ((DiscoveryFinderClientImpl) testee).evictDiscoveryEndpointsCacheValues();
+        Awaitility.await().atLeast(Duration.ofMillis(100))
+                  // THEN
+                  .untilAsserted(() -> assertThat(cache.get(request)).isNull());
 
-        // THEN
-        {
-            final var cache = getDiscoveryEndpointsCache();
-            final var cacheValue = cache.get(request);
-            assertThat(cacheValue).isNull();
-        }
     }
 
     private void simulateFindDiscoveryEndpointsRestRequest(final DiscoveryFinderRequest discoveryFinderRequest,