Progress on #71 - Constructed labels

Author: zspitz

Tests.Common/Constructed/MakeLabel.cs

@@ -7,100 +7,16 @@ namespace ExpressionToString.Tests {
     public partial class ConstructedBase {
         [Fact]
         [Trait("Category", Labels)]
-        public void ConstructLabel() => RunTest(
-            // we're using variables here to force explicit blocks, which have indentation
-            // in order to verify that the label is written without indentation
-            Block(
-                new[] { i },
-                Block(
-                    new[] { j },
-                    Constant(true),
-                    Label(Label("target")),
-                    Constant(true)
-                )
-            ),
-            @"(
-    int i,
-    (
-        int j,
-        true,
-target:
-        true
-    )
-)",
-            @"Block
-    Dim i As Integer
-    Block
-        Dim j As Integer
-        True
-target:
-        True
-    End Block
-End Block",
-            @"Block(new[] { i },
-    Block(new[] { j },
-        Constant(true),
-        Label(
-            Label(""target""),
-            null
-        ),
-        Constant(true)
-    )
-)"
-        );
+        public void ConstructLabel() => PreRunTest();
 
         [Fact]
         [Trait("Category", Labels)]
-        public void ConstructLabel1() => RunTest(
-            Block(
-                new[] { i },
-                Block(
-                    new[] { j },
-                    Label(Label("target")),
-                    Constant(true)
-                )
-            ),
-            @"(
-    int i,
-    (
-        int j,
-target:
-        true
-    )
-)",
-            @"Block
-    Dim i As Integer
-    Block
-        Dim j As Integer
-target:
-        True
-    End Block
-End Block",
-            @"Block(new[] { i },
-    Block(new[] { j },
-        Label(
-            Label(""target""),
-            null
-        ),
-        Constant(true)
-    )
-)"
-        );
+        public void ConstructLabel1() => PreRunTest();
 
         [Fact]
-        public void ConstructLabelTarget() => RunTest(
-            Label("target"),
-            "target",
-            "target", 
-            @"Label(""target"")"
-        );
+        public void ConstructLabelTarget() => PreRunTest();
 
         [Fact]
-        public void ConstructEmptyLabelTarget() => RunTest(
-            Label(""),
-            "",
-            "",
-            @"Label("""")"
-        );
+        public void ConstructEmptyLabelTarget() => PreRunTest();
     }
 }

Tests.Common/Objects/FactoryMethods/MakeLabel.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using static ExpressionToString.Tests.Functions;
+using static ExpressionToString.Tests.Categories;
+using static System.Linq.Expressions.Expression;
+using static ExpressionToString.Tests.Globals;
+
+namespace ExpressionToString.Tests.Objects {
+    partial class FactoryMethods {
+
+        [Category(Labels)]
+        // we're using variables here to force explicit blocks, which have indentation
+        // in order to verify that the label is written without indentation
+        public static readonly Expression ConstructLabel = Block(
+            new[] { i },
+            Block(
+                new[] { j },
+                Constant(true),
+                Label(Label("target")),
+                Constant(true)
+            )
+        );
+
+        [Category(Labels)]
+        public static readonly Expression ConstructLabel1 = Block(
+            new[] { i },
+            Block(
+                new[] { j },
+                Label(Label("target")),
+                Constant(true)
+            )
+        );
+
+        [Category(Labels)]
+        public static readonly LabelTarget ConstructLabelTarget = Label("target");
+
+        [Category(Labels)]
+        public static readonly LabelTarget ConstructEmptyLabelTarget = Label("");
+
+    }
+}