adapt tests

Author: Jonas-Isr

cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DestinationServiceTest.java

@@ -1255,9 +1255,13 @@ void testConcurrentFetchSameDestinationButDifferentTenant()
         assertThat(DestinationService.Cache.isolationLocks().asMap())
             .containsOnlyKeys(
                 CacheKey.fromIds("TenantA", null).append(destinationName, options),
-                CacheKey.fromIds("TenantA", null).append(options),
+                CacheKey
+                    .fromIds("TenantA", null)
+                    .append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(options)),
                 CacheKey.fromIds("TenantB", null).append(destinationName, options),
-                CacheKey.fromIds("TenantB", null).append(options));
+                CacheKey
+                    .fromIds("TenantB", null)
+                    .append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(options)));
 
         // assert cache entries for one get-single command for each tenant
         assertThat(DestinationService.Cache.instanceSingle().asMap())
@@ -1327,7 +1331,9 @@ void testPrincipalIsolationForDestinationWithUserPropagationWithExchangeOnlyStra
             .containsOnlyKeys(
                 CacheKey.of(subscriberTenant, principal1).append(destinationName, options),
                 CacheKey.of(subscriberTenant, principal2).append(destinationName, options),
-                CacheKey.of(subscriberTenant, null).append(options));
+                CacheKey
+                    .of(subscriberTenant, null)
+                    .append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(options)));
 
         assertThat(DestinationService.Cache.instanceSingle().asMap())
             .containsOnlyKeys(
@@ -1371,7 +1377,9 @@ void testPrincipalIsolationForDestinationWithUserPropagationWithDefaultExchangeS
         assertThat(DestinationService.Cache.isolationLocks().asMap())
             .containsOnlyKeys(
                 CacheKey.of(subscriberTenant, null).append(destinationName, options),
-                CacheKey.of(subscriberTenant, null).append(options));
+                CacheKey
+                    .of(subscriberTenant, null)
+                    .append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(options)));
 
         assertThat(DestinationService.Cache.instanceSingle().asMap())
             .containsOnlyKeys(

cloudplatform/connectivity-destination-service/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/GetOrComputeAllDestinationsCommandTest.java

@@ -90,7 +90,12 @@ void testCommandIsIdempotent()
         assertThat(result.get()).containsExactly(destination);
 
         assertThat(allDestinationsCache.estimatedSize()).isEqualTo(1);
-        assertThat(allDestinationsCache.getIfPresent(CacheKey.ofNoIsolation().append(EMPTY_OPTIONS)))
+        assertThat(
+            allDestinationsCache
+                .getIfPresent(
+                    CacheKey
+                        .ofNoIsolation()
+                        .append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(EMPTY_OPTIONS))))
             .containsExactly(destination);
         verify(tryGetAllDestinations, times(1)).get();
     }
@@ -104,8 +109,10 @@ void testIsolationAndAtomicityPerTenant()
         final CountDownLatch mainThreadLatch = new CountDownLatch(1);
         final CountDownLatch getAllLatch = new CountDownLatch(1);
         final AtomicInteger lockInvocations = new AtomicInteger();
-        final CacheKey t1Key = CacheKey.of(t1, null).append(EMPTY_OPTIONS);
-        final CacheKey t2Key = CacheKey.of(t2, null).append(EMPTY_OPTIONS);
+        final CacheKey t1Key =
+            CacheKey.of(t1, null).append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(EMPTY_OPTIONS));
+        final CacheKey t2Key =
+            CacheKey.of(t2, null).append(DestinationServiceOptionsAugmenter.getRetrievalStrategy(EMPTY_OPTIONS));
         final ReentrantLock tenantIsolationLock = spy(ReentrantLock.class);
 
         doAnswer(invocation -> {