add unit tests

Author: chaowlert

ExpressionDebugger.Console/Program.cs

@@ -9,7 +9,11 @@ static void Main(string[] args)
         {
             var p1 = Expression.Parameter(typeof(int));
             var p2 = Expression.Parameter(typeof(int));
-            var body = Expression.Add(p1, p2);
+            var body = Expression.Add(p1, Expression.Block(
+                new Expression[] {
+                    Expression.Call(typeof(System.Console).GetMethod("WriteLine", new [] { typeof(int) }), p2),
+                    p2,
+                }));
             var lambda = Expression.Lambda<Func<int, int, int>>(body, p1, p2);
             var fun = lambda.CompileWithDebugInfo();
             var result = fun(1, 2);

ExpressionDebugger.Tests/DebugInfoInjectorTest.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace ExpressionDebugger.Tests
@@ -22,6 +23,14 @@ public int Main(int a, int b)
                 , str);
         }
 
+        [TestMethod]
+        public void TestBinary_PowerAssign()
+        {
+            var exp = Expression.PowerAssign(Expression.Variable(typeof(double), "d"), Expression.Constant(2d));
+            var str = exp.ToScript();
+            Assert.AreEqual("d = Math.Pow(d, 2d)", str);
+        }
+
         [TestMethod]
         public void TestBinary_ArrayIndex()
         {
@@ -111,16 +120,25 @@ public void TestConditional_Block_Chain()
         }
 
         [TestMethod]
-        public void TestConstant()
+        public void TestConstants()
         {
-            Expression<Func<string, char>> fn = s => s == "x" || s == null || s.IsNormalized() == false || s.GetType() == typeof(string) ? 'x' : s[0];
+            Expression<Func<string, char>> fn = s => s == "x" || s == @"\" || s == null || s.IsNormalized() == false || s.GetType() == typeof(string) ? 'x' : s[0];
             var str = fn.ToScript();
             Assert.AreEqual(@"
 public char Main(string s)
 {
-    return s == ""x"" || s == null || s.IsNormalized() == false || s.GetType() == typeof(string) ? 'x' : s[0];
+    return s == ""x"" || s == @""\"" || s == null || s.IsNormalized() == false || s.GetType() == typeof(string) ? 'x' : s[0];
 }"
                 , str);
+
+            Expression<Func<string>> fn2 = () => 1f.ToString() + 2m.ToString() + ((byte)1).ToString() + DayOfWeek.Friday.ToString() + default(DateTime).ToString();
+            var str2 = fn2.ToScript();
+            Assert.AreEqual(@"
+public string Main()
+{
+    return 1f.ToString() + 2m.ToString() + ((byte)1).ToString() + DayOfWeek.Friday.ToString() + default(DateTime).ToString();
+}"
+                , str2);
         }
 
         [TestMethod]
@@ -130,7 +148,7 @@ public void TestConstant_DateTime()
             var expr = Expression.Constant(now);
             var script = expr.ToScript();
             Assert.AreEqual(@"
-public DateTime DateTime1;
+private DateTime DateTime1;
 DateTime1", script);
         }
 
@@ -222,6 +240,26 @@ public int Main(int x)
                 , str);
         }
 
+        [TestMethod]
+        public void TestGroup_MultiLine()
+        {
+            var p = Expression.Variable(typeof(int), "p");
+            var exp = Expression.Add(
+                p,
+                Expression.Block(
+                new Expression[] {
+                    Expression.Call(typeof(Console).GetMethod(nameof(Console.WriteLine), new [] { typeof(int) }), p),
+                    p,
+                }
+            ));
+            var str = exp.ToScript();
+            Assert.AreEqual(@"p + (new Func<int>(() => {
+    Console.WriteLine(p);
+    return p;
+}))()"
+                , str);
+        }
+
         [TestMethod]
         public void TestIndex()
         {
@@ -597,6 +635,42 @@ public void TestUnary_As()
 public Expression Main(Expression expr)
 {
     return expr as UnaryExpression;
+}"
+                , str);
+        }
+
+        internal static int GetInternal() => 1;
+
+        [TestMethod]
+        public void TestToString()
+        {
+            var call = Expression.Call(
+                typeof(DebugInfoInjectorTest).GetMethod(nameof(GetInternal),
+                    BindingFlags.Static | BindingFlags.NonPublic)
+            );
+            var exp = Expression.Lambda<Func<int>>(call);
+            var str = exp.ToScript(new ExpressionDefinitions
+            {
+                IsStatic = true,
+                MethodName = "Main",
+                Namespace = "ExpressionDebugger.Tests",
+                TypeName = "MockClass"
+            });
+            Assert.AreEqual(@"
+using System;
+
+
+namespace ExpressionDebugger.Tests
+{
+    public static partial class MockClass
+    {
+        private static Func<int> GetInternal1;
+        
+        public static int Main()
+        {
+            return GetInternal1.Invoke();
+        }
+    }
 }"
                 , str);
         }

ExpressionTranslator/ExpressionTranslator.cs

@@ -281,7 +281,7 @@ private Expression VisitGroup(Expression node, ExpressionType parentNodeType, bo
                 Indent(true);
                 result = VisitMultiline(node, true);
                 Outdent();
-                Write(")()");
+                Write("))()");
             }
             else if (ShouldGroup(node, parentNodeType, isRightNode))
             {
@@ -773,7 +773,7 @@ private void WriteValue(object value)
             }
             else if (value is byte || value is sbyte || value is short || value is ushort)
             {
-                Write("(", Translate(value.GetType()), ")", value.ToString());
+                Write("((", Translate(value.GetType()), ")", value.ToString(), ")");
             }
             else if (value.GetType().GetTypeInfo().IsEnum)
             {