From fa41588779c8559d12e734ff86a941b7e74567b4 Mon Sep 17 00:00:00 2001
From: Cesar Blum Silveira <cesars@microsoft.com>
Date: Thu, 4 Aug 2016 14:07:21 -0700
Subject: [PATCH] Move server start failure test in MaxRequestLineSizeTests to
 KestrelServerTests.

---
 .../MaxRequestLineSizeTests.cs                 | 15 ---------------
 .../KestrelServerTests.cs                      | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs
index 644fef0687..1e582f0bce 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/MaxRequestLineSizeTests.cs
@@ -67,21 +67,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
             }
         }
 
-        [Theory]
-        [InlineData(1, 2)]
-        [InlineData(int.MaxValue - 1, int.MaxValue)]
-        public void ServerFailsToStartWhenMaxRequestBufferSizeIsLessThanMaxRequestLineSize(long maxRequestBufferSize, int maxRequestLineSize)
-        {
-            using (var host = BuildWebHost(options =>
-            {
-                options.Limits.MaxRequestBufferSize = maxRequestBufferSize;
-                options.Limits.MaxRequestLineSize = maxRequestLineSize;
-            }))
-            {
-                Assert.Throws<InvalidOperationException>(() => host.Start());
-            }
-        }
-
         private IWebHost BuildWebHost(Action<KestrelServerOptions> options)
         {
             var host = new WebHostBuilder()
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
index 556d6f848e..d14df869a1 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/KestrelServerTests.cs
@@ -49,6 +49,24 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
             Assert.Equal("No recognized listening addresses were configured.", exception.Message);
         }
 
+        [Theory]
+        [InlineData(1, 2)]
+        [InlineData(int.MaxValue - 1, int.MaxValue)]
+        public void StartWithMaxRequestBufferSizeLessThanMaxRequestLineSizeThrows(long maxRequestBufferSize, int maxRequestLineSize)
+        {
+            var options = new KestrelServerOptions();
+            options.Limits.MaxRequestBufferSize = maxRequestBufferSize;
+            options.Limits.MaxRequestLineSize = maxRequestLineSize;
+
+            var server = CreateServer(options);
+
+            var exception = Assert.Throws<InvalidOperationException>(() => StartDummyApplication(server));
+
+            Assert.Equal(
+                $"Maximum request buffer size ({maxRequestBufferSize}) must be greater than or equal to maximum request line size ({maxRequestLineSize}).",
+                exception.Message);
+        }
+
         private static KestrelServer CreateServer(KestrelServerOptions options)
         {
             var lifetime = new LifetimeNotImplemented();