Merge pull request #544 from wisepotato/fix/sort-issues

Fix/sort issues

Author: maurei

src/JsonApiDotNetCore/Services/QueryParser.cs

@@ -153,7 +153,10 @@ protected virtual List<SortQuery> ParseSortParameters(string value)
 
             const char DESCENDING_SORT_OPERATOR = '-';
             var sortSegments = value.Split(QueryConstants.COMMA);
-
+            if(sortSegments.Where(s => s == string.Empty).Count() >0)
+            {
+                throw new JsonApiException(400, "The sort URI segment contained a null value.");
+            }
             foreach (var sortSegment in sortSegments)
             {
                 var propertyName = sortSegment;

test/UnitTests/Services/QueryParser_Tests.cs renamed to test/UnitTests/Services/QueryParserTests.cs

@@ -12,12 +12,12 @@
 
 namespace UnitTests.Services
 {
-    public class QueryParser_Tests
+    public class QueryParserTests
     {
         private readonly Mock<IControllerContext> _controllerContextMock;
         private readonly Mock<IQueryCollection> _queryCollectionMock;
 
-        public QueryParser_Tests()
+        public QueryParserTests()
         {
             _controllerContextMock = new Mock<IControllerContext>();
             _queryCollectionMock = new Mock<IQueryCollection>();
@@ -126,11 +126,34 @@ public void Can_Disable_Filters()
             // assert
             Assert.Empty(querySet.Filters);
         }
+        [Theory]
+        [InlineData("text,,1")]
+        [InlineData("text,hello,,5")]
+        [InlineData(",,2")]
+        public void Parse_EmptySortSegment_ReceivesJsonApiException(string stringSortQuery)
+        {
+            // Arrange
+            var query = new Dictionary<string, StringValues> {
+                { "sort", new StringValues(stringSortQuery) }
+            };
+
+            _queryCollectionMock
+                .Setup(m => m.GetEnumerator())
+                .Returns(query.GetEnumerator());
+
+            var queryParser = new QueryParser(_controllerContextMock.Object, new JsonApiOptions());
 
+            // Act / Assert
+            var exception = Assert.Throws<JsonApiException>(() =>
+            {
+                var querySet = queryParser.Parse(_queryCollectionMock.Object);
+            });
+            Assert.Contains("sort", exception.Message);
+        }
         [Fact]
         public void Can_Disable_Sort()
         {
-            // arrange
+            // Arrange
             var query = new Dictionary<string, StringValues> {
                 { "sort", new StringValues("-key") }
             };

test/UnitTests/UnitTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
@@ -9,6 +9,7 @@
   </ItemGroup>
   <ItemGroup>
   <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3" />
+  <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />