fix(blockingtimeout): Blocking timeout was not being assigned (#202)

Author: msohailhussain

OptimizelySDK.Tests/ConfigTest/HttpProjectConfigManagerTest.cs

@@ -205,7 +205,11 @@ public void TestDefaultBlockingTimeoutWhileProvidingZero()
                 .WithBlockingTimeoutPeriod(TimeSpan.FromMilliseconds(0))
                 .WithStartByDefault(true)
                 .Build(true);
-            
+
+            var fieldInfo = httpManager.GetType().GetField("BlockingTimeout", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var expectedBlockingTimeout = (TimeSpan)fieldInfo.GetValue(httpManager);
+            Assert.AreNotEqual(expectedBlockingTimeout.TotalSeconds, TimeSpan.Zero.TotalSeconds);
+
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Blocking timeout is not valid, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
         }
 
@@ -221,6 +225,10 @@ public void TestDefaultPeriodWhileProvidingZero()
                 .WithStartByDefault(true)
                 .Build(true);
 
+            var fieldInfo = typeof(PollingProjectConfigManager).GetField("PollingInterval", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var expectedPollingInterval = (TimeSpan)fieldInfo.GetValue(httpManager);
+            Assert.AreNotEqual(expectedPollingInterval.TotalSeconds, TimeSpan.Zero.TotalSeconds);
+
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
         }
 
@@ -236,6 +244,10 @@ public void TestDefaultPeriodWhileProvidingNegative()
                 .WithStartByDefault(true)
                 .Build(true);
 
+            var fieldInfo = typeof(PollingProjectConfigManager).GetField("PollingInterval", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var expectedPollingInterval = (TimeSpan)fieldInfo.GetValue(httpManager);
+            Assert.AreNotEqual(expectedPollingInterval.TotalSeconds, TimeSpan.Zero.TotalSeconds);
+
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));            
         }
 
@@ -247,6 +259,10 @@ public void TestDefaultPeriodWhileNotProvidingValue()
                 .WithDatafile(TestData.Datafile)
                 .WithLogger(LoggerMock.Object)                
                 .Build(true);
+            
+            var fieldInfo = typeof(PollingProjectConfigManager).GetField("PollingInterval", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var expectedPollingInterval = (TimeSpan)fieldInfo.GetValue(httpManager);
+            Assert.AreNotEqual(expectedPollingInterval.TotalSeconds, TimeSpan.Zero.TotalSeconds);
 
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No polling interval provided, using default period {TimeSpan.FromMinutes(5).TotalMilliseconds}ms"));
         }
@@ -260,6 +276,10 @@ public void TestDefaultBlockingTimeoutWhileNotProvidingValue()
                 .WithLogger(LoggerMock.Object)                
                 .Build(true);
 
+            var fieldInfo = httpManager.GetType().GetField("BlockingTimeout", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
+            var expectedBlockingTimeout = (TimeSpan)fieldInfo.GetValue(httpManager);
+            Assert.AreNotEqual(expectedBlockingTimeout.TotalSeconds, TimeSpan.Zero.TotalSeconds);
+
             LoggerMock.Verify(l => l.Log(LogLevel.DEBUG, $"No Blocking timeout provided, using default blocking timeout {TimeSpan.FromSeconds(15).TotalMilliseconds}ms"));
         }
 

OptimizelySDK/Config/HttpProjectConfigManager.cs

@@ -264,20 +264,21 @@ public HttpProjectConfigManager Build(bool defer)
                 if (IsPollingIntervalProvided && (Period.TotalMilliseconds <= 0 || Period.TotalMilliseconds > MAX_MILLISECONDS_LIMIT)) {
                     Logger.Log(LogLevel.DEBUG, $"Polling interval is not valid for periodic calls, using default period {DEFAULT_PERIOD.TotalMilliseconds}ms");
                     Period = DEFAULT_PERIOD;
-                } else {
+                } else if(!IsPollingIntervalProvided) {
                     Logger.Log(LogLevel.DEBUG, $"No polling interval provided, using default period {DEFAULT_PERIOD.TotalMilliseconds}ms");
+                    Period = DEFAULT_PERIOD;
                 }
 
 
                 if (IsBlockingTimeoutProvided && (BlockingTimeoutSpan.TotalMilliseconds <= 0 || BlockingTimeoutSpan.TotalMilliseconds > MAX_MILLISECONDS_LIMIT)) {
                     Logger.Log(LogLevel.DEBUG, $"Blocking timeout is not valid, using default blocking timeout {DEFAULT_BLOCKINGOUT_PERIOD.TotalMilliseconds}ms");
                     BlockingTimeoutSpan = DEFAULT_BLOCKINGOUT_PERIOD;
-                } else {
+                } else if(!IsBlockingTimeoutProvided) {
                     Logger.Log(LogLevel.DEBUG, $"No Blocking timeout provided, using default blocking timeout {DEFAULT_BLOCKINGOUT_PERIOD.TotalMilliseconds}ms");
+                    BlockingTimeoutSpan = DEFAULT_BLOCKINGOUT_PERIOD;
                 }
 
 
-
                 configManager = new HttpProjectConfigManager(Period, Url, BlockingTimeoutSpan, AutoUpdate, Logger, ErrorHandler);
 
                 if (Datafile != null)