more unit tests to implement ITest

dadhi · dadhi · commit da1ddd4f00e6 · 2021-03-04T19:46:04.000+03:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,37 +4,6 @@
    // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
    "version": "0.2.0",
    "configurations": [
-
-        {
-            "name": ".NET Core Launch (Benchmarks)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build_benchmarks",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/test/FastExpressionCompiler.Benchmarks/bin/Debug/netcoreapp3.1/FastExpressionCompiler.Benchmarks.exe",
-            "args": [],
-            "cwd": "${workspaceFolder}/test/FastExpressionCompiler.Benchmarks",
-            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
-            "console": "internalConsole",
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart",
-            "requireExactSource": false // allows to for moderate code editing while debugging
-        },
-        {
-            "name": ".NET Core Launch (UnitTests)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build_testsrunner",
-            // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/test/FastExpressionCompiler.UnitTests/bin/Debug/netcoreapp3.1/FastExpressionCompiler.UnitTests.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/test/FastExpressionCompiler.TestsRunner",
-            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
-            "console": "internalConsole",
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart",
-            "requireExactSource": false // allows to for moderate code editing while debugging
-        },
         {
             "name": ".NET Core Launch (TestsRunner)",
             "type": "coreclr",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -14,16 +14,6 @@
                 "kind": "build",
                 "isDefault": true
             }
-        },
-        {
-            "label": "build_benchmarks",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/test/FastExpressionCompiler.Benchmarks/FastExpressionCompiler.Benchmarks.csproj"
-            ],
-            "problemMatcher": "$msCompile"
         }
     ]
 }
diff --git a/test/FastExpressionCompiler.IssueTests/Issue293_Recursive_Methods.cs b/test/FastExpressionCompiler.IssueTests/Issue293_Recursive_Methods.cs
@@ -1,6 +1,6 @@
 using NUnit.Framework;
-using System;
-using System.Linq.Expressions;
+using System;
+using System.Linq.Expressions;
 #if LIGHT_EXPRESSION
 using System.Text;
 using static FastExpressionCompiler.LightExpression.Expression;
@@ -29,45 +29,49 @@ public void Test_Recursive_Expression()
             fs.PrintIL();
             var res = fs(4);
 
-            var f = expr.CompileFast(true);
+            var f = expr.CompileFast(true, CompilerFlags.NoInvocationLambdaInlining);
             f.PrintIL();
             var res2 = f(4);
 
+            // f = expr.CompileFast(true);
+            // f.PrintIL();
+            // res2 = f(4);
+
             Assert.AreEqual(res, res2);
         }
 
         //from https://chriscavanagh.wordpress.com/2012/06/18/recursive-methods-in-expression-trees/
-        public Expression<Func<T, T>> MakeFactorialExpression<T>()
-        {
-            var nParam = Expression.Parameter(typeof(T), "n");
-            var methodVar = Expression.Variable(typeof(Func<T, T>), "factorial");
-            var one = Expression.Convert(Expression.Constant(1), typeof(T));
-
-            return Expression.Lambda<Func<T, T>>(
-                Expression.Block(
-                    // Func<uint, uint> method;
-                    new[] { methodVar },
-                    // method = n => ( n <= 1 ) ? 1 : n * method( n - 1 );
-                    Expression.Assign(
-                        methodVar,
-                        Expression.Lambda<Func<T, T>>(
-                            Expression.Condition(
-                                // ( n <= 1 )
-                                Expression.LessThanOrEqual(nParam, one),
-                                // 1
-                                one,
-                                // n * method( n - 1 )
-                                Expression.Multiply(
-                                    // n
-                                    nParam,
-                                    // method( n - 1 )
-                                    Expression.Invoke(
-                                        methodVar,
-                                        Expression.Subtract(nParam, one)))),
-                            nParam)),
-                    // return method( n );
-                    Expression.Invoke(methodVar, nParam)),
-                nParam);
+        public Expression<Func<T, T>> MakeFactorialExpression<T>()
+        {
+            var nParam = Expression.Parameter(typeof(T), "n");
+            var methodVar = Expression.Variable(typeof(Func<T, T>), "factorial");
+            var one = Expression.Constant(1, typeof(T));
+
+            return Expression.Lambda<Func<T, T>>(
+                Expression.Block(
+                    // Func<uint, uint> method;
+                    new[] { methodVar },
+                    // method = n => ( n <= 1 ) ? 1 : n * method( n - 1 );
+                    Expression.Assign(
+                        methodVar,
+                        Expression.Lambda<Func<T, T>>(
+                            Expression.Condition(
+                                // ( n <= 1 )
+                                Expression.LessThanOrEqual(nParam, one),
+                                // 1
+                                one,
+                                // n * method( n - 1 )
+                                Expression.Multiply(
+                                    // n
+                                    nParam,
+                                    // method( n - 1 )
+                                    Expression.Invoke(
+                                        methodVar,
+                                        Expression.Subtract(nParam, one)))),
+                            nParam)),
+                    // return method( n );
+                    Expression.Invoke(methodVar, nParam)),
+                nParam);
         }
     }
 }
diff --git a/test/FastExpressionCompiler.TestsRunner/Program.cs b/test/FastExpressionCompiler.TestsRunner/Program.cs
@@ -11,8 +11,9 @@ public static void Main()
         {
             RunAllTests();
 
+            // new FastExpressionCompiler.LightExpression.IssueTests.Issue293_Recursive_Methods().Run();
+
             //new FastExpressionCompiler.LightExpression.IssueTests.Issue274_Failing_Expressions_in_Linq2DB().Run();
-            
             // new FastExpressionCompiler.LightExpression.IssueTests.Issue159_NumericConversions().Run();
             // new FastExpressionCompiler.LightExpression.UnitTests.BinaryExpressionTests().Run();
             // new FastExpressionCompiler.LightExpression.IssueTests.Issue284_Invalid_Program_after_Coalesce().Run();
@@ -195,6 +196,9 @@ void Run(Func<int> run, string name = null)
                 Run(new Issue284_Invalid_Program_after_Coalesce().Run);
                 Run(new FastExpressionCompiler.LightExpression.IssueTests.Issue284_Invalid_Program_after_Coalesce().Run);
 
+                // Run(new Issue293_Recursive_Methods().Run);
+                // Run(new FastExpressionCompiler.LightExpression.IssueTests.Issue293_Recursive_Methods().Run);
+
                 Console.WriteLine($"============={Environment.NewLine}IssueTests are passing in {sw.ElapsedMilliseconds} ms.");
             });
 
diff --git a/test/FastExpressionCompiler.UnitTests/BlockTests.cs b/test/FastExpressionCompiler.UnitTests/BlockTests.cs
@@ -14,7 +14,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class BlockTests
+    public class BlockTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/ClosureConstantTests.cs b/test/FastExpressionCompiler.UnitTests/ClosureConstantTests.cs
@@ -12,7 +12,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class ClosureConstantTests
+    public class ClosureConstantTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/CoalesceTests.cs b/test/FastExpressionCompiler.UnitTests/CoalesceTests.cs
@@ -10,7 +10,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class CoalesceTests
+    public class CoalesceTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/ConvertOperatorsTests.cs b/test/FastExpressionCompiler.UnitTests/ConvertOperatorsTests.cs
@@ -11,7 +11,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class ConvertOperatorsTests
+    public class ConvertOperatorsTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/DefaultTests.cs b/test/FastExpressionCompiler.UnitTests/DefaultTests.cs
@@ -9,8 +9,8 @@ namespace FastExpressionCompiler.LightExpression.UnitTests
 namespace FastExpressionCompiler.UnitTests
 #endif
 {
-[TestFixture]
-    public class DefaultTests
+    [TestFixture]
+    public class DefaultTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/EqualityOperatorsTests.cs b/test/FastExpressionCompiler.UnitTests/EqualityOperatorsTests.cs
@@ -11,7 +11,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class EqualityOperatorsTests
+    public class EqualityOperatorsTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/GotoTests.cs b/test/FastExpressionCompiler.UnitTests/GotoTests.cs
@@ -10,7 +10,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class GotoTests
+    public class GotoTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/HoistedLambdaExprTests.cs b/test/FastExpressionCompiler.UnitTests/HoistedLambdaExprTests.cs
@@ -5,7 +5,7 @@
 namespace FastExpressionCompiler.UnitTests
 {
     [TestFixture]
-    public class HoistedLambdaExprTests
+    public class HoistedLambdaExprTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/ManuallyComposedExprTests.cs b/test/FastExpressionCompiler.UnitTests/ManuallyComposedExprTests.cs
@@ -13,7 +13,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class ManuallyComposedExprTests
+    public class ManuallyComposedExprTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/PreConstructedClosureTests.cs b/test/FastExpressionCompiler.UnitTests/PreConstructedClosureTests.cs
@@ -11,7 +11,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class PreConstructedClosureTests
+    public class PreConstructedClosureTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/TypeBinaryExpressionTests.cs b/test/FastExpressionCompiler.UnitTests/TypeBinaryExpressionTests.cs
@@ -10,7 +10,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class TypeBinaryExpressionTests
+    public class TypeBinaryExpressionTests : ITest
     {
         public int Run()
         {
diff --git a/test/FastExpressionCompiler.UnitTests/ValueTypeTests.cs b/test/FastExpressionCompiler.UnitTests/ValueTypeTests.cs
@@ -11,7 +11,7 @@ namespace FastExpressionCompiler.UnitTests
 #endif
 {
     [TestFixture]
-    public class ValueTypeTests
+    public class ValueTypeTests : ITest
     {
         public int Run()
         {

Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,6 @@`
`14`	`14`	`"kind": "build",`
`15`	`15`	`"isDefault": true`
`16`	`16`	`}`
`17`		`- },`
`18`		`- {`
`19`		`- "label": "build_benchmarks",`
`20`		`- "command": "dotnet",`
`21`		`- "type": "process",`
`22`		`- "args": [`
`23`		`- "build",`
`24`		`- "${workspaceFolder}/test/FastExpressionCompiler.Benchmarks/FastExpressionCompiler.Benchmarks.csproj"`
`25`		`- ],`
`26`		`- "problemMatcher": "$msCompile"`
`27`	`17`	`}`
`28`	`18`	`]`
`29`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace FastExpressionCompiler.UnitTests`
`14`	`14`	`#endif`
`15`	`15`	`{`
`16`	`16`	`[TestFixture]`
`17`		`- public class BlockTests`
	`17`	`+ public class BlockTests : ITest`
`18`	`18`	`{`
`19`	`19`	`public int Run()`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace FastExpressionCompiler.UnitTests`
`12`	`12`	`#endif`
`13`	`13`	`{`
`14`	`14`	`[TestFixture]`
`15`		`- public class ClosureConstantTests`
	`15`	`+ public class ClosureConstantTests : ITest`
`16`	`16`	`{`
`17`	`17`	`public int Run()`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace FastExpressionCompiler.UnitTests`
`10`	`10`	`#endif`
`11`	`11`	`{`
`12`	`12`	`[TestFixture]`
`13`		`- public class CoalesceTests`
	`13`	`+ public class CoalesceTests : ITest`
`14`	`14`	`{`
`15`	`15`	`public int Run()`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace FastExpressionCompiler.UnitTests`
`11`	`11`	`#endif`
`12`	`12`	`{`
`13`	`13`	`[TestFixture]`
`14`		`- public class ConvertOperatorsTests`
	`14`	`+ public class ConvertOperatorsTests : ITest`
`15`	`15`	`{`
`16`	`16`	`public int Run()`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ namespace FastExpressionCompiler.LightExpression.UnitTests`
`9`	`9`	`namespace FastExpressionCompiler.UnitTests`
`10`	`10`	`#endif`
`11`	`11`	`{`
`12`		`-[TestFixture]`
`13`		`- public class DefaultTests`
	`12`	`+ [TestFixture]`
	`13`	`+ public class DefaultTests : ITest`
`14`	`14`	`{`
`15`	`15`	`public int Run()`
`16`	`16`	`{`