Port over tests from QueryHelpersTests + fixes

Author: gfoidl

src/Http/Http/src/Features/QueryFeature.cs

@@ -73,14 +73,9 @@ public IQueryCollection Query
 
                     var result = ParseNullableQueryInternal(current);
 
-                    if (result == null)
-                    {
-                        _parsedValues = QueryCollection.Empty;
-                    }
-                    else
-                    {
-                        _parsedValues = new QueryCollectionInternal(result);
-                    }
+                    _parsedValues = result is not null
+                        ? new QueryCollectionInternal(result)
+                        : QueryCollection.Empty;
                 }
                 return _parsedValues;
             }
@@ -165,7 +160,10 @@ public IQueryCollection Query
                 }
                 else
                 {
-                    accumulator.Append(querySegment);
+                    if (!querySegment.IsEmpty)
+                    {
+                        accumulator.Append(querySegment);
+                    }
                 }
 
                 if (delimiterIndex < 0)
@@ -207,11 +205,6 @@ public void Append(ReadOnlySpan<char> key, ReadOnlySpan<char> value = default)
             /// </summary>
             public void Append(string key, string value)
             {
-                if (key.Length == 0)
-                {
-                    return;
-                }
-
                 if (_accumulator is null)
                 {
                     _accumulator = new AdaptiveCapacityDictionary<string, StringValues>(StringComparer.OrdinalIgnoreCase);

src/Http/Http/test/Features/QueryFeatureTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Linq;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Http.Features
@@ -12,9 +13,7 @@ public void QueryReturnsParsedQueryCollection()
         {
             // Arrange
             var features = new FeatureCollection();
-            var request = new HttpRequestFeature();
-            request.QueryString = "foo=bar";
-            features[typeof(IHttpRequestFeature)] = request;
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "foo=bar" };
 
             var provider = new QueryFeature(features);
 
@@ -25,6 +24,23 @@ public void QueryReturnsParsedQueryCollection()
             Assert.Equal("bar", queryCollection["foo"]);
         }
 
+        [Theory]
+        [InlineData("?key1=value1&key2=value2")]
+        [InlineData("key1=value1&key2=value2")]
+        public void ParseQueryWithUniqueKeysWorks(string queryString)
+        {
+            var features = new FeatureCollection();
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = queryString };
+
+            var provider = new QueryFeature(features);
+
+            var queryCollection = provider.Query;
+
+            Assert.Equal(2, queryCollection.Count);
+            Assert.Equal("value1", queryCollection["key1"].FirstOrDefault());
+            Assert.Equal("value2", queryCollection["key2"].FirstOrDefault());
+        }
+
         [Theory]
         [InlineData("?q", "q")]
         [InlineData("?q&", "q")]
@@ -34,9 +50,7 @@ public void QueryReturnsParsedQueryCollection()
         public void KeyWithoutValuesAddedToQueryCollection(string queryString, string emptyParam)
         {
             var features = new FeatureCollection();
-            var request = new HttpRequestFeature();
-            request.QueryString = queryString;
-            features[typeof(IHttpRequestFeature)] = request;
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = queryString };
 
             var provider = new QueryFeature(features);
 
@@ -53,15 +67,73 @@ public void KeyWithoutValuesAddedToQueryCollection(string queryString, string em
         public void EmptyKeysNotAddedToQueryCollection(string queryString)
         {
             var features = new FeatureCollection();
-            var request = new HttpRequestFeature();
-            request.QueryString = queryString;
-            features[typeof(IHttpRequestFeature)] = request;
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = queryString };
 
             var provider = new QueryFeature(features);
 
             var queryCollection = provider.Query;
 
             Assert.Equal(0, queryCollection.Count);
         }
+
+        [Fact]
+        public void ParseQueryWithEmptyKeyWorks()
+        {
+            var features = new FeatureCollection();
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?=value1&=" };
+
+            var provider = new QueryFeature(features);
+
+            var queryCollection = provider.Query;
+
+            Assert.Single(queryCollection);
+            Assert.Equal(new[] { "value1", "" }, queryCollection[""]);
+        }
+
+        [Fact]
+        public void ParseQueryWithDuplicateKeysGroups()
+        {
+            var features = new FeatureCollection();
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?key1=valueA&key2=valueB&key1=valueC" };
+
+            var provider = new QueryFeature(features);
+
+            var queryCollection = provider.Query;
+
+            Assert.Equal(2, queryCollection.Count);
+            Assert.Equal(new[] { "valueA", "valueC" }, queryCollection["key1"]);
+            Assert.Equal("valueB", queryCollection["key2"].FirstOrDefault());
+        }
+
+        [Fact]
+        public void ParseQueryWithEmptyValuesWorks()
+        {
+            var features = new FeatureCollection();
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = "?key1=&key2=" };
+
+            var provider = new QueryFeature(features);
+
+            var queryCollection = provider.Query;
+
+            Assert.Equal(2, queryCollection.Count);
+            Assert.Equal(string.Empty, queryCollection["key1"].FirstOrDefault());
+            Assert.Equal(string.Empty, queryCollection["key2"].FirstOrDefault());
+        }
+
+        [Theory]
+        [InlineData("?")]
+        [InlineData("")]
+        [InlineData(null)]
+        public void ParseEmptyOrNullQueryWorks(string queryString)
+        {
+            var features = new FeatureCollection();
+            features[typeof(IHttpRequestFeature)] = new HttpRequestFeature { QueryString = queryString };
+
+            var provider = new QueryFeature(features);
+
+            var queryCollection = provider.Query;
+
+            Assert.Empty(queryCollection);
+        }
     }
 }