Factory methods writer -- params for SwitchCase

zspitz · May 30, 2019 · ee3bad0 · ee3bad0
1 parent a9be5bf
commit ee3bad0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 45 deletions.
diff --git a/Shared/FactoryMethodsFormatter.cs b/Shared/FactoryMethodsFormatter.cs
@@ -479,7 +479,8 @@ protected override void WriteBinding(MemberBinding binding) {
             }
         }
 
-        protected override void WriteSwitchCase(SwitchCase switchCase) => WriteMethodCall(() => SwitchCase(switchCase.Body, switchCase.TestValues));
+        protected override void WriteSwitchCase(SwitchCase switchCase) => 
+            WriteMethodCall(() => SwitchCase(switchCase.Body, switchCase.TestValues.ToArray()));
 
         protected override void WriteCatchBlock(CatchBlock catchBlock) {
             if (catchBlock.Variable != null) {

diff --git a/Tests.Common/Constructed/MakeSwitch.cs b/Tests.Common/Constructed/MakeSwitch.cs
@@ -39,9 +39,7 @@ public void SingleValueSwitchCase() => RunTest(
             Constant(true)
         )
     ),
-    new[] {
-        Constant(5)
-    }
+    Constant(5)
 )"
 
         );
@@ -69,10 +67,8 @@ public void MultiValueSwitchCase() => RunTest(
             Constant(true)
         )
     ),
-    new[] {
-        Constant(5),
-        Constant(6)
-    }
+    Constant(5),
+    Constant(6)
 )"
         );
 
@@ -90,9 +86,7 @@ public void SingleValueSwitchCase1() => RunTest(
         typeof(Console).GetMethod(""WriteLine""),
         Constant(true)
     ),
-    new[] {
-        Constant(5)
-    }
+    Constant(5)
 )"
         );
 
@@ -111,10 +105,8 @@ public void MultiValueSwitchCase1() => RunTest(
         typeof(Console).GetMethod(""WriteLine""),
         Constant(true)
     ),
-    new[] {
-        Constant(5),
-        Constant(6)
-    }
+    Constant(5),
+    Constant(6)
 )"
         );
 
@@ -153,18 +145,14 @@ Case Else
             typeof(Console).GetMethod(""WriteLine""),
             Constant(true)
         ),
-        new[] {
-            Constant(4)
-        }
+        Constant(4)
     ),
     SwitchCase(
         Call(
             typeof(Console).GetMethod(""WriteLine""),
             Constant(false)
         ),
-        new[] {
-            Constant(5)
-        }
+        Constant(5)
     )
 )"
         );
@@ -214,18 +202,14 @@ Case Else
             typeof(Console).GetMethod(""WriteLine""),
             Constant(true)
         ),
-        new[] {
-            Constant(4)
-        }
+        Constant(4)
     ),
     SwitchCase(
         Call(
             typeof(Console).GetMethod(""WriteLine""),
             Constant(false)
         ),
-        new[] {
-            Constant(5)
-        }
+        Constant(5)
     )
 )"
         );
@@ -282,18 +266,14 @@ Case Else
             typeof(Console).GetMethod(""WriteLine""),
             Constant(true)
         ),
-        new[] {
-            Constant(4)
-        }
+        Constant(4)
     ),
     SwitchCase(
         Call(
             typeof(Console).GetMethod(""WriteLine""),
             Constant(false)
         ),
-        new[] {
-            Constant(5)
-        }
+        Constant(5)
     )
 )"
         );
@@ -328,18 +308,14 @@ Case 5
             typeof(Console).GetMethod(""WriteLine""),
             Constant(true)
         ),
-        new[] {
-            Constant(4)
-        }
+        Constant(4)
     ),
     SwitchCase(
         Call(
             typeof(Console).GetMethod(""WriteLine""),
             Constant(false)
         ),
-        new[] {
-            Constant(5)
-        }
+        Constant(5)
     )
 )"
         );
@@ -381,18 +357,14 @@ Case 5
             typeof(Console).GetMethod(""WriteLine""),
             Constant(true)
         ),
-        new[] {
-            Constant(4)
-        }
+        Constant(4)
     ),
     SwitchCase(
         Call(
             typeof(Console).GetMethod(""WriteLine""),
             Constant(false)
         ),
-        new[] {
-            Constant(5)
-        }
+        Constant(5)
     )
 )"
         );