Test regression fixes

Author: zspitz

Shared/FactoryMethodsFormatter.cs

@@ -59,7 +59,7 @@ private void WriteMethodCall(string name, IEnumerable args) {
                 } else if (arg is { }) {
                     if (
                         (
-                            argType?.InheritsFromOrImplementsAny(NodeTypes) ?? false ||
+                            argType!.InheritsFromOrImplementsAny(NodeTypes) ||
                             arg is MemberInfo || 
                             arg is CallSiteBinder
                         ) && !(

Tests.DataGenerator/Program.cs

@@ -12,7 +12,7 @@ class Program {
         static void Main(string[] args) {
             Loader.Load();
 
-            var formatter = FactoryMethods;
+            var formatter = TextualTree;
             var language = CSharp;
 
             var lines = new List<string>();

Tests.DotNetCore/TestContainer.cs

@@ -57,11 +57,9 @@ public class TestContainer : IClassFixture<ExpectedDataFixture> {
         [Theory]
         [MemberData(nameof(TestObjectsData))]
         public void TestMethod(string formatter, string objectName, string category, object o) {
-            if (formatter != "Factory methods") { return; }
-            if (objectName != "CSCompiler.StaticMember") { return; }
-
             var expected = fixture.expectedStrings[(formatter, objectName)];
             var (actual, paths) = GetToString(formatter, o);
+
             // test that the string result is correct
             Assert.Equal(expected, actual);
 

Tests.DotNetCore/expectedResults/textual tree-testdata.txt

@@ -1879,13 +1879,13 @@ Lambda (Func<string>)
         · Arguments[0] - Constant (string) = ","
         · Arguments[1] - NewArrayInit (string[])
             · Expressions[0] - New (string)
-                · Arguments[0] - MemberAccess (char[]) $VB$Local_arr = new[] {  }
+                · Arguments[0] - MemberAccess (char[]) $VB$Local_arr = new[] { 'a', 'b' }
                     · Expression - Constant (<closure>)
 ---- VBCompiler.StaticMethod2ArgumentsWithoutConversion
 Lambda (Func<string>)
     · Body - Call (string) stringJoin
         · Arguments[0] - Constant (string) = ","
-        · Arguments[1] - MemberAccess (IEnumerable<char>) $VB$Local_arr = new[] {  }
+        · Arguments[1] - MemberAccess (IEnumerable<char>) $VB$Local_arr = new[] { 'a', 'b' }
             · Expression - Constant (<closure>)
 ---- VBCompiler.ExtensionMethod2Arguments
 Lambda (Func<IOrderedEnumerable<string>>)

_expressionTestObjectsTest/Program.cs

@@ -1,12 +1,19 @@
 using System;
 using ExpressionTreeTestObjects;
+using ExpressionTreeToString;
+using static System.Linq.Expressions.Expression;
 
 namespace _expressionTestObjectsTest {
     class Program {
         static void Main(string[] args) {
-            var lst = Objects.Get();
+            //var lst = Objects.Get();
 
-            Console.WriteLine("Hello World!");
+            //Console.WriteLine("Hello World!");
+
+            var expr = Lambda(
+                Constant(null, typeof(string))
+            );
+            Console.WriteLine(expr.ToString("Factory methods"));
         }
     }
 }

_expressionTestObjectsTest/_expressionTestObjectsTest.csproj

@@ -8,6 +8,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ExpressionTreeTestObjects.VB\TestObjects.VB.vbproj" />
     <ProjectReference Include="..\ExpressionTreeTestObjects\TestObjects.csproj" />
+    <ProjectReference Include="..\Library\Library.csproj" />
   </ItemGroup>
 
 </Project>