Merge pull request #92 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -3,6 +3,7 @@
 using Shouldly;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace CodingSeb.ExpressionEvaluator.Tests
@@ -985,6 +986,12 @@ public void TypeTesting(string expression, Type type)
 
         #endregion
 
+        #region Bugs correction
+
+        [TestCase("new DateTime(1985,9,11).ToString(\"dd.MM.yyyy\")", ExpectedResult = "11.09.1985", Category = "Complex expression,Static method,Instance method,Lambda function,Cast")]
+
+        #endregion
+
         #endregion
         public object DirectExpressionEvaluation(string expression)
         {
@@ -1277,9 +1284,9 @@ private void Evaluator_EvaluateVariable(object sender, VariableEvaluationEventAr
             }
         }
 
-        [TestCase("ClassForTest1.Add(1, 5)", ExpectedResult = 6, Category = "On the fly method")]
-        [TestCase("ClassForTest1.Add(1, 5.0)", ExpectedResult = 6, Category = "On the fly method")]
-        public object OnTheFlyEvaluation2(string expression)
+        [TestCase("ClassForTest1.Add(1, 5)", ExpectedResult = 6)]
+        [TestCase("ClassForTest1.Add(1, 5.0)", ExpectedResult = 6)]
+        public object OnTheFlyCastEvaluation(string expression)
         {
             ExpressionEvaluator evaluator = new ExpressionEvaluator(new ContextObject1());
 
@@ -1303,6 +1310,27 @@ private void Evaluator_EvaluateParameterCast(object sender, ParameterCastEvaluat
             }
         }
 
+        [TestCase("2[\"Test\"]", ExpectedResult = "Test,Test")]
+        [TestCase("3[\"Hello\"]", ExpectedResult = "Hello,Hello,Hello")]
+        public object OnTheFlyIndexingEvaluation(string expression)
+        {
+            ExpressionEvaluator evaluator = new ExpressionEvaluator(new ContextObject1());
+
+            evaluator.PreEvaluateIndexing += Evaluator_PreEvaluateIndexing;
+
+            evaluator.Namespaces.Add("CodingSeb.ExpressionEvaluator.Tests");
+
+            return evaluator.Evaluate(expression);
+        }
+
+        private void Evaluator_PreEvaluateIndexing(object sender, IndexingPreEvaluationEventArg e)
+        {
+            if(e.This is int intValue && e.EvaluateArg() is string text)
+            {
+                e.Value = string.Join(",", Enumerable.Repeat(text, intValue));
+            }
+        }
+
         #endregion
 
         #endregion
@@ -1492,6 +1520,7 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingEvaluation
                     { "P1var", "P1" },
                     { "myObj", new ClassForTest1() },
                     { "nullVar", null },
+                    { "myArray", new int[] {1, 2, 3} },
                 });
 
                 evaluator.PreEvaluateVariable += (sender, e) =>
@@ -1506,11 +1535,18 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingEvaluation
                         e.CancelEvaluation = true;
                 };
 
+                evaluator.PreEvaluateIndexing += (sender, e) =>
+                {
+                    if (e.This is int[])
+                        e.CancelEvaluation = true;
+                };
+
                 yield return new TestCaseData(evaluator, "Pi", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
                 yield return new TestCaseData(evaluator, "P1var", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
                 yield return new TestCaseData(evaluator, "myObj.PropertyThatWillFailed", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Var");
                 yield return new TestCaseData(evaluator, "myObj.Add3To(5)", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Func");
                 yield return new TestCaseData(evaluator, "Abs(-5)", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFly canceled Func");
+                yield return new TestCaseData(evaluator, "myArray[1]", typeof(ExpressionEvaluatorSyntaxErrorException)).SetCategory("OnTheFlyCanceledIndexing");
                 #endregion
 
                 #region Bugs corrections
@@ -1529,7 +1565,20 @@ public static IEnumerable<TestCaseData> TestCasesForExceptionThrowingEvaluation
         [TestCaseSource(nameof(TestCasesForExceptionThrowingEvaluation))]
         public void ExceptionThrowingEvaluation(ExpressionEvaluator evaluator, string expression, Type exceptionType)
         {
-            Assert.Catch(exceptionType, () => evaluator.Evaluate(expression));
+            Exception e = null;
+            object result = null;
+
+            try
+            {
+                result = evaluator.Evaluate(expression);
+            }
+            catch(Exception exception)
+            {
+                e = exception;
+            }
+
+            result.ShouldBeNull();
+            e.ShouldNotBeNull().ShouldBeOfType(exceptionType);
         }
 
         #endregion

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.23.0</Version>
-    <AssemblyVersion>1.4.23.0</AssemblyVersion>
-    <FileVersion>1.4.23.0</FileVersion>
+    <Version>1.4.24.0</Version>
+    <AssemblyVersion>1.4.24.0</AssemblyVersion>
+    <FileVersion>1.4.24.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,8 +19,9 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Add the option OptionCanDeclareMultiExpressionsLambdaInSimpleExpressionEvaluate (default is true)
-* Allow to declare and call multi expressions lambda in simple expression Evaluate</PackageReleaseNotes>
+    <PackageReleaseNotes>* Add an event to customize  the cast of a method argument
+* Add 2 events ExpressionEvaluating and ExpressionEvaluated to hook easily each expression evaluation. Allow to modify expression to evaluate and the corresponding result.
+* Correction of a bug in method call selection (dateTime.ToString(format) work again)</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
   </PropertyGroup>