Progress in #71 -- finished test objects created with factory methods

Author: zspitz

Tests.Common/Constructed/ArrayIndexer.cs

@@ -1,77 +1,26 @@
-using ExpressionToString.Util;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using Xunit;
-using static System.Linq.Expressions.Expression;
-using static ExpressionToString.Tests.Globals;
+using Xunit;
 using static ExpressionToString.Tests.Categories;
 
 namespace ExpressionToString.Tests {
     public partial class ConstructedBase {
         [Fact]
         [Trait("Category", Indexer)]
-        public void MakeArrayIndex() => RunTest(
-            ArrayIndex(arr, Constant(0)),
-            "arr[0]",
-            "arr(0)",
-            @"ArrayIndex(arr,
-    Constant(0)
-)"
-        );
+        public void MakeArrayIndex() => PreRunTest();
 
         [Fact]
         [Trait("Category", Indexer)]
-        public void MakeArrayMultipleIndex() => RunTest(
-            ArrayIndex(arr2D, Constant(0), Constant(1)),
-            "arr2d[0, 1]",
-            "arr2d(0, 1)", 
-            @"ArrayIndex(arr2d,
-    Constant(0),
-    Constant(1)
-)"
-        );
+        public void MakeArrayMultipleIndex() => PreRunTest();
 
         [Fact]
         [Trait("Category", Indexer)]
-        public void MakeArrayAccess() => RunTest(
-            ArrayAccess(arr, Constant(0)),
-            "arr[0]",
-            "arr(0)",
-            @"ArrayAccess(arr,
-    Constant(0)
-)"
-        );
+        public void MakeArrayAccess() => PreRunTest();
 
         [Fact]
         [Trait("Category", Indexer)]
-        public void InstanceIndexer() => RunTest(
-            MakeIndex(
-                lstString, listIndexer, new[] { Constant(0) as Expression }
-            ),
-            "lstString[0]",
-            "lstString(0)", 
-            @"MakeIndex(lstString,
-    typeof(List<string>).GetProperty(""Item""),
-    new[] {
-        Constant(0)
-    }
-)"
-        );
+        public void InstanceIndexer() => PreRunTest();
 
         [Fact]
         [Trait("Category", Indexer)]
-        public void PropertyIndexer() => RunTest(
-            Property(lstString, listIndexer, Constant(0)),
-            "lstString[0]",
-            "lstString(0)", 
-            @"MakeIndex(lstString,
-    typeof(List<string>).GetProperty(""Item""),
-    new[] {
-        Constant(0)
-    }
-)"
-        );
+        public void PropertyIndexer() => PreRunTest();
     }
 }

Tests.Common/Constructed/Constants.cs

@@ -9,86 +9,26 @@ namespace ExpressionToString.Tests {
     public partial class ConstructedBase {
         [Fact]
         [Trait("Category", Constants)]
-        public void Random() => RunTest(
-            Constant(new Random()), 
-            "#Random", 
-            "#Random", 
-            "Constant(#Random)"
-        );
+        public void Random() => PreRunTest();
 
         [Fact]
         [Trait("Category", Constants)]
-        public void ValueTuple() => RunTest(
-            Constant(("abcd", 5)), 
-            "(\"abcd\", 5)",
-            "(\"abcd\", 5)", 
-            @"Constant((""abcd"", 5))"
-        );
+        public void ValueTuple() => PreRunTest();
 
         [Fact]
         [Trait("Category", Constants)]
-        public void OldTuple() => RunTest(
-            Constant(Tuple.Create("abcd", 5)),
-            "(\"abcd\", 5)",
-            "(\"abcd\", 5)", 
-            @"Constant((""abcd"", 5))"
-        );
+        public void OldTuple() => PreRunTest();
 
         [Fact]
         [Trait("Category", Constants)]
-        public void DateTime() {
-            // test rendered VB literal
-            var dte = new DateTime(1981, 1, 1);
-            RunTest(
-                Constant(dte), 
-                "#DateTime", 
-                $"#{dte.ToString()}#", 
-                "Constant(#DateTime)"
-            );
-        }
+        public void Array() => PreRunTest();
 
         [Fact]
         [Trait("Category", Constants)]
-        public void TimeSpan() {
-            // test rendered VB literal
-            var ts = new TimeSpan(5, 4, 3, 2);
-            RunTest(
-                Constant(ts), 
-                "#TimeSpan", 
-                $"#{ts.ToString()}#", 
-                "Constant(#TimeSpan)"
-            );
-        }
+        public void Type() => PreRunTest();
 
         [Fact]
         [Trait("Category", Constants)]
-        public void Array() => RunTest(
-            Constant(new object[] { "abcd", 5, new Random() }),
-            "new[] { \"abcd\", 5, #Random }",
-            "{ \"abcd\", 5, #Random }",
-            @"Constant(new[] { ""abcd"", 5, #Random })"
-        );
-
-        [Fact]
-        [Trait("Category", Constants)]
-        public void Type() => RunTest(
-            Constant(typeof(string)),
-            "typeof(string)",
-            "GetType(String)", 
-            @"Constant(
-    typeof(string)
-)"
-        );
-
-        [Fact]
-        [Trait("Category", Constants)]
-        public void DifferentTypeForNodeAndValue() => RunTest(
-            Constant(new List<string>(), typeof(IEnumerable)),
-            "#List<string>",
-            "#List(Of String)",
-            @"Constant(#List<string>,
-    typeof(IEnumerable)
-)"
-        );
+        public void DifferentTypeForNodeAndValue() => PreRunTest();
     }
 }