x

Author: StefH

test/System.Linq.Dynamic.Core.Tests/QueryableTests.OrderBy.cs

@@ -1,7 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq.Dynamic.Core.Exceptions;
+using System.Linq.Dynamic.Core.Parser;
 using System.Linq.Dynamic.Core.Tests.Helpers.Models;
+using FluentAssertions;
 using Xunit;
 
 namespace System.Linq.Dynamic.Core.Tests;
@@ -242,4 +244,24 @@ public void OrderBy_Dynamic_Exceptions()
         Assert.Throws<ArgumentException>(() => qry.OrderBy(""));
         Assert.Throws<ArgumentException>(() => qry.OrderBy(" "));
     }
+
+    [Theory]
+    [InlineData(KeywordsHelper.KEYWORD_IT)]
+    [InlineData(KeywordsHelper.SYMBOL_IT)]
+    [InlineData(KeywordsHelper.KEYWORD_ROOT)]
+    [InlineData(KeywordsHelper.SYMBOL_ROOT)]
+    [InlineData("\"User\" + \"Name\"")]
+    [InlineData("\"User\" + \"Name\" asc")]
+    [InlineData("\"User\" + \"Name\" desc")]
+    public void OrderBy_RestrictOrderByIsTrue_NonRestrictedExpressionShouldNotThrow(string expression)
+    {
+        // Arrange
+        var queryable = User.GenerateSampleModels(3).AsQueryable();
+
+        // Act
+        Action action = () => _ = queryable.OrderBy(expression);
+
+        // Assert 2
+        action.Should().NotThrow();
+    }
 }

test/System.Linq.Dynamic.Core.Tests/QueryableTests.OrderByDescending.cs

@@ -1,6 +1,4 @@
-using System.Linq.Dynamic.Core.Parser;
-using System.Linq.Dynamic.Core.Tests.Helpers.Models;
-using FluentAssertions;
+using System.Linq.Dynamic.Core.Tests.Helpers.Models;
 using Xunit;
 
 namespace System.Linq.Dynamic.Core.Tests
@@ -39,25 +37,5 @@ public void OrderByDescending_Dynamic_AsStringExpression()
             //Assert
             Assert.Equal(expectedDesc.ToArray(), orderByIdDesc.Cast<string>().ToArray());
         }
-
-        [Theory]
-        [InlineData(KeywordsHelper.KEYWORD_IT)]
-        [InlineData(KeywordsHelper.SYMBOL_IT)]
-        [InlineData(KeywordsHelper.KEYWORD_ROOT)]
-        [InlineData(KeywordsHelper.SYMBOL_ROOT)]
-        [InlineData("\"User\" + \"Name\"")]
-        [InlineData("\"User\" + \"Name\" asc")]
-        [InlineData("\"User\" + \"Name\" desc")]
-        public void Entities_OrderBy_RestrictOrderByIsTrue_NonRestrictedExpressionShouldNotThrow(string expression)
-        {
-            // Arrange
-            var queryable = User.GenerateSampleModels(3).AsQueryable();
-
-            // Act
-            Action action = () => _ = queryable.OrderBy(expression);
-
-            // Assert 2
-            action.Should().NotThrow();
-        }
     }
 }