Merge pull request #381 from camunda-community-hub/zell-fix-380

Return max if exceeding max wait time
camunda-community-hub · Feb 7, 2022 · 50cb6e9 · 50cb6e9
2 parents 358c012 + de7fbbf
commit 50cb6e9
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/Client.UnitTests/ZeebeClientTest.cs b/Client.UnitTests/ZeebeClientTest.cs
@@ -245,6 +245,33 @@ public async Task ShouldUseAccessTokenSupplier()
             Assert.AreEqual(3, accessTokenSupplier.Count);
         }
 
+        [Test]
+        public void ShouldCalculateNextGreaterWaitTime()
+        {
+            // given
+            var defaultWaitTimeProvider = ZeebeClient.DefaultWaitTimeProvider;
+
+            // when
+            var firstSpan = defaultWaitTimeProvider.Invoke(1);
+            var secondSpan = defaultWaitTimeProvider.Invoke(2);
+
+            // then
+            Assert.Greater(secondSpan, firstSpan);
+        }
+
+        [Test]
+        public void ShouldReturnMaxIfReachingMaxWaitTime()
+        {
+            // given
+            var defaultWaitTimeProvider = ZeebeClient.DefaultWaitTimeProvider;
+
+            // when
+            var maxTime = defaultWaitTimeProvider.Invoke(100);
+
+            // then
+            Assert.AreEqual(TimeSpan.FromSeconds(ZeebeClient.MaxWaitTimeInSeconds), maxTime);
+        }
+
         private class SimpleAccessTokenSupplier : IAccessTokenSupplier
         {
             public int Count { get; private set; }

diff --git a/Client/ZeebeClient.cs b/Client/ZeebeClient.cs
@@ -33,9 +33,9 @@ namespace Zeebe.Client
     /// <inheritdoc />
     public class ZeebeClient : IZeebeClient
     {
-        private static readonly int MaxWaitTimeInSeconds = 60;
-        private static readonly Func<int, TimeSpan> DefaultWaitTimeProvider =
-            retryAttempt => TimeSpan.FromSeconds(Math.Max(Math.Pow(2, retryAttempt), MaxWaitTimeInSeconds));
+        internal static readonly int MaxWaitTimeInSeconds = 60;
+        internal static readonly Func<int, TimeSpan> DefaultWaitTimeProvider =
+            retryAttempt => TimeSpan.FromSeconds(Math.Min(Math.Pow(2, retryAttempt), MaxWaitTimeInSeconds));
         private static readonly TimeSpan DefaultKeepAlive = TimeSpan.FromSeconds(30);
 
         private readonly Channel channelToGateway;