Unittests for #71 and #83

Author: StefH

src/System.Linq.Dynamic.Core/ExpressionParser.cs

@@ -2633,7 +2633,7 @@ string GetIdentifier()
 
         Exception ParseError(string format, params object[] args)
         {
-            return ParseError(_textParser.CurrentToken.Pos, format, args);
+            return ParseError(_textParser?.CurrentToken.Pos ?? 0, format, args);
         }
 
         static Exception ParseError(int pos, string format, params object[] args)

test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs

@@ -23,6 +23,22 @@ private class ComplexParseLambda1Result
             public int TotalIncome;
         }
 
+        [Fact]
+        public void ParseLambda_DuplicateParameterNames_ThrowsException()
+        {
+            // Arrange
+            var parameters = new[]
+            {
+                Expression.Parameter(typeof(int), "x"),
+                Expression.Parameter(typeof(int), "x")
+            };
+
+            // Act and Assert
+            Check.ThatCode(() => DynamicExpressionParser.ParseLambda(parameters, typeof(bool), "it == 42"))
+                .Throws<ParseException>()
+                .WithMessage("The identifier 'x' was defined more than once");
+        }
+
         [Fact]
         public void ParseLambda_EmptyParameterList()
         {

test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs

@@ -12,6 +12,60 @@ namespace System.Linq.Dynamic.Core.Tests
 {
     public class ExpressionTests
     {
+        public enum TestEnum2 : sbyte
+        {
+            Var1 = 0,
+            Var2 = 1,
+            Var3 = 2,
+            Var4 = 4,
+            Var5 = 8,
+            Var6 = 16,
+        }
+
+        public class TestEnumClass
+        {
+            public TestEnum A { get; set; }
+
+            public TestEnum2 B { get; set; }
+
+            public int Id { get; set; }
+        }
+
+        public class TestGuidNullClass
+        {
+            public Guid? GuidNull { get; set; }
+
+            public int Id { get; set; }
+        }
+
+        [Fact]
+        public void ExpressionTests_Add_Number()
+        {
+            //Arrange
+            var values = new[] { -1, 2 }.AsQueryable();
+
+            //Act
+            var result = values.Select<int>("it + 1");
+            var expected = values.Select(i => i + 1);
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
+        [Fact]
+        public void ExpressionTests_Add_String()
+        {
+            //Arrange
+            var values = new[] { "a", "b" }.AsQueryable();
+
+            //Act
+            var result = values.Select<string>("it + \"z\"");
+            var expected = values.Select(i => i + "z");
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
         [Fact]
         public void ExpressionTests_ArrayInitializer()
         {
@@ -34,25 +88,6 @@ public void ExpressionTests_ArrayInitializer()
             Assert.Throws<ParseException>(() => list.AsQueryable().SelectMany("new] {}"));
         }
 
-        public enum TestEnum2 : sbyte
-        {
-            Var1 = 0,
-            Var2 = 1,
-            Var3 = 2,
-            Var4 = 4,
-            Var5 = 8,
-            Var6 = 16,
-        }
-
-        public class TestEnumClass
-        {
-            public TestEnum A { get; set; }
-
-            public TestEnum2 B { get; set; }
-
-            public int Id { get; set; }
-        }
-
         [Fact]
         public void ExpressionTests_BinaryAndNumericConvert()
         {
@@ -379,6 +414,20 @@ public void ExpressionTests_DistinctBy()
             Assert.Equal(qry3.Count(), 2);
         }
 
+        [Fact]
+        public void ExpressionTests_Divide_Number()
+        {
+            //Arrange
+            var values = new[] { -10, 20 }.AsQueryable();
+
+            //Act
+            var result = values.Select<int>("it / 10");
+            var expected = values.Select(i => i / 10);
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
         [Fact]
         public void ExpressionTests_Double()
         {
@@ -684,13 +733,6 @@ public void ExpressionTests_GuidNullable_CompareTo_GuidNullable()
             Assert.Equal(testValue, resultb.Single());
         }
 
-        public class TestGuidNullClass
-        {
-            public Guid? GuidNull { get; set; }
-
-            public int Id { get; set; }
-        }
-
         [Fact]
         public void ExpressionTests_Guid_CompareTo_Null()
         {
@@ -1108,6 +1150,34 @@ public void ExpressionTests_Method_OneParam_With_user()
             Assert.Equal(expected.Count(), result.Count());
         }
 
+        [Fact]
+        public void ExpressionTests_Modulo_Number()
+        {
+            //Arrange
+            var values = new[] { -10, 20 }.AsQueryable();
+
+            //Act
+            var result = values.Select<int>("it % 3");
+            var expected = values.Select(i => i % 3);
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
+        [Fact]
+        public void ExpressionTests_Multiply_Number()
+        {
+            //Arrange
+            var values = new[] { -1, 2 }.AsQueryable();
+
+            //Act
+            var result = values.Select<int>("it * 10");
+            var expected = values.Select(i => i * 10);
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
         [Fact]
         public void ExpressionTests_NullCoalescing()
         {
@@ -1295,6 +1365,20 @@ public void ExpressionTests_StringConcatenation()
             Assert.Equal("FirstNamex y", resultAddWithAmpAndParams.First());
         }
 
+        [Fact]
+        public void ExpressionTests_Subtract_Number()
+        {
+            //Arrange
+            var values = new[] { -1, 2 }.AsQueryable();
+
+            //Act
+            var result = values.Select<int>("it - 10");
+            var expected = values.Select(i => i - 10);
+
+            //Assert
+            Check.That(result).ContainsExactly(expected);
+        }
+
         [Fact]
         public void ExpressionTests_Sum()
         {