More tests

Author: JamesNK

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3ConnectionTests.cs

@@ -110,5 +110,26 @@ await WaitForConnectionErrorAsync<Http3ConnectionErrorException>(
                 expectedErrorCode: Http3ErrorCode.StreamCreationError,
                 expectedErrorMessage: CoreStrings.FormatHttp3ControlStreamErrorMultipleInboundStreams(name));
         }
+
+        [Theory]
+        [InlineData(nameof(Http3FrameType.Data))]
+        [InlineData(nameof(Http3FrameType.Headers))]
+        [InlineData(nameof(Http3FrameType.PushPromise))]
+        public async Task ControlStream_UnexpectedFrameType_ConnectionError(string frameType)
+        {
+            await InitializeConnectionAsync(_noopApplication);
+
+            var controlStream = await CreateControlStream();
+
+            var frame = new Http3RawFrame();
+            frame.Type = Enum.Parse<Http3FrameType>(frameType);
+            await controlStream.SendFrameAsync(frame, Memory<byte>.Empty);
+
+            await WaitForConnectionErrorAsync<Http3ConnectionErrorException>(
+                ignoreNonGoAwayFrames: true,
+                expectedLastStreamId: 0,
+                expectedErrorCode: Http3ErrorCode.UnexpectedFrame,
+                expectedErrorMessage: CoreStrings.FormatHttp3ErrorUnsupportedFrameOnControlStream(Http3Formatting.ToFormattedType(frame.Type)));
+        }
     }
 }

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs

@@ -121,27 +121,20 @@ internal async ValueTask<Http3ControlStream> GetInboundControlStream()
         {
             if (_inboundControlStream == null)
             {
-                return await CreateNewInboundControlStream();
-            }
-
-            return null;
-        }
-
-        internal async ValueTask<Http3ControlStream> CreateNewInboundControlStream()
-        {
-            var reader = MultiplexedConnectionContext.ToClientAcceptQueue.Reader;
-            while (await reader.WaitToReadAsync())
-            {
-                while (reader.TryRead(out var stream))
+                var reader = MultiplexedConnectionContext.ToClientAcceptQueue.Reader;
+                while (await reader.WaitToReadAsync())
                 {
-                    _inboundControlStream = stream;
-                    var streamId = await stream.TryReadStreamIdAsync();
-                    Debug.Assert(streamId == 0, "StreamId sent that was non-zero, which isn't handled by tests");
-                    return _inboundControlStream;
+                    while (reader.TryRead(out var stream))
+                    {
+                        _inboundControlStream = stream;
+                        var streamId = await stream.TryReadStreamIdAsync();
+                        Debug.Assert(streamId == 0, "StreamId sent that was non-zero, which isn't handled by tests");
+                        return _inboundControlStream;
+                    }
                 }
             }
 
-            throw new InvalidOperationException("Should never reach here.");
+            return null;
         }
 
         internal async Task WaitForConnectionErrorAsync<TException>(bool ignoreNonGoAwayFrames, long expectedLastStreamId, Http3ErrorCode expectedErrorCode, params string[] expectedErrorMessage)
@@ -464,21 +457,12 @@ internal async Task WaitForStreamErrorAsync(Http3ErrorCode protocolError, string
                 _testBase.Logger.LogTrace("Input is completed");
 
                 Assert.True(readResult.IsCompleted);
-                //try
-                {
-                    Assert.Equal(protocolError, (Http3ErrorCode)Error);
+                Assert.Equal(protocolError, (Http3ErrorCode)Error);
 
-                    if (expectedErrorMessage != null)
-                    {
-                        Assert.Contains(_testBase.LogMessages, m => m.Exception?.Message.Contains(expectedErrorMessage) ?? false);
-                    }
+                if (expectedErrorMessage != null)
+                {
+                    Assert.Contains(_testBase.LogMessages, m => m.Exception?.Message.Contains(expectedErrorMessage) ?? false);
                 }
-                //catch (Exception ex)
-                //{
-                //    Debugger.Launch();
-                //    string s = ex.Message;
-                //    throw;
-                //}
             }
         }