From 8cd58b042c55ab07096c055f0e13140aa9c4ed0b Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Fri, 14 Apr 2017 15:40:44 -0700
Subject: [PATCH] Fix tests using Heartbeat

---
 .../Internal/Infrastructure/Heartbeat.cs                 | 3 +--
 .../DateHeaderValueManagerTests.cs                       | 9 ++++++---
 .../HeartbeatTests.cs                                    | 5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs
index 94e58d8ea8..eb15bdc686 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel.Core/Internal/Infrastructure/Heartbeat.cs
@@ -63,8 +63,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
             }
             else
             {
-                // Tests usually pass in a null trace
-                _trace?.TimerSlow(_interval, now);
+                _trace.TimerSlow(_interval, now);
             }
         }
 
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs
index 8bcc60ea07..766d07c630 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/DateHeaderValueManagerTests.cs
@@ -46,8 +46,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
 
             var timerInterval = TimeSpan.FromSeconds(10);
             var dateHeaderValueManager = new DateHeaderValueManager(systemClock);
+            var testKestrelTrace = new TestKestrelTrace();
 
-            using (new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, null, timerInterval))
+            using (new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, testKestrelTrace, timerInterval))
             {
                 Assert.Equal(now.ToString(Rfc1123DateFormat), dateHeaderValueManager.GetDateHeaderValues().String);
                 systemClock.UtcNow = future;
@@ -69,13 +70,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
 
             var timerInterval = TimeSpan.FromMilliseconds(100);
             var dateHeaderValueManager = new DateHeaderValueManager(systemClock);
+            var testKestrelTrace = new TestKestrelTrace();
 
             var heartbeatTcs = new TaskCompletionSource<object>();
             var mockHeartbeatHandler = new Mock<IHeartbeatHandler>();
 
             mockHeartbeatHandler.Setup(h => h.OnHeartbeat(future)).Callback(() => heartbeatTcs.TrySetResult(null));
 
-            using (new Heartbeat(new[] { dateHeaderValueManager, mockHeartbeatHandler.Object }, systemClock, null, timerInterval))
+            using (new Heartbeat(new[] { dateHeaderValueManager, mockHeartbeatHandler.Object }, systemClock, testKestrelTrace, timerInterval))
             {
                 Assert.Equal(now.ToString(Rfc1123DateFormat), dateHeaderValueManager.GetDateHeaderValues().String);
 
@@ -100,8 +102,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
 
             var timerInterval = TimeSpan.FromSeconds(10);
             var dateHeaderValueManager = new DateHeaderValueManager(systemClock);
+            var testKestrelTrace = new TestKestrelTrace();
 
-            using (new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, null, timerInterval))
+            using (new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, testKestrelTrace, timerInterval))
             {
                 Assert.Equal(now.ToString(Rfc1123DateFormat), dateHeaderValueManager.GetDateHeaderValues().String);
             }
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs
index 8c7ea7d850..1e26c32226 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Core.Tests/HeartbeatTests.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Callback(() => handlerMre.Wait());
             kestrelTrace.Setup(t => t.TimerSlow(heartbeatInterval, systemClock.UtcNow)).Callback(() => traceMre.Set());
 
-            using (new Heartbeat(new[] {heartbeatHandler.Object}, systemClock, kestrelTrace.Object, heartbeatInterval))
+            using (new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, kestrelTrace.Object, heartbeatInterval))
             {
                 Assert.True(traceMre.Wait(TimeSpan.FromSeconds(10)));
             }
@@ -42,13 +42,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
         public void ExceptionFromHeartbeatHandlerIsLoggedAsError()
         {
             var systemClock = new MockSystemClock();
+            var heartbeatInterval = TimeSpan.FromMilliseconds(10);
             var heartbeatHandler = new Mock<IHeartbeatHandler>();
             var kestrelTrace = new TestKestrelTrace();
             var ex = new Exception();
 
             heartbeatHandler.Setup(h => h.OnHeartbeat(systemClock.UtcNow)).Throws(ex);
 
-            using (new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, kestrelTrace))
+            using (new Heartbeat(new[] { heartbeatHandler.Object }, systemClock, kestrelTrace, heartbeatInterval))
             {
                 Assert.True(kestrelTrace.Logger.MessageLoggedTask.Wait(TimeSpan.FromSeconds(10)));
             }