Refactor

pester · Apr 28, 2024 · 20d72f6 · 20d72f6
1 parent a08eb61
commit 20d72f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/src/csharp/Pester/ToStringConverter.cs b/src/csharp/Pester/ToStringConverter.cs
@@ -18,32 +18,21 @@ static string ResultToString(string result)
             };
         }
 
-        internal static string ContainerItemToString(string Type, object Item)
+        internal static string ContainerItemToString(string type, object item)
         {
-            string path;
-            switch (Type)
+            return type switch
             {
-                case Constants.File:
-                    path = Item is FileInfo f ? f.FullName : Item.ToString();
-                    break;
-                case Constants.ScriptBlock:
-                    path = "<ScriptBlock>";
-                    if (Item is ScriptBlock s && !string.IsNullOrWhiteSpace(s.File))
-                    {
-                        path += $":{s.File}:{s.StartPosition.StartLine}";
-                    }
-                    break;
-                default:
-                    path = $"<{Type}>";
-                    break;
-            }
-
-            return path;
+                Constants.File => item is FileInfo f ? f.FullName : item.ToString(),
+                Constants.ScriptBlock => item is ScriptBlock s && !string.IsNullOrWhiteSpace(s.File)
+                    ? $"<ScriptBlock>:{s.File}:{s.StartPosition.StartLine}"
+                    : "<ScriptBlock>",
+                _ => $"<{type}>"
+            };
         }
 
         internal static string ContainerToString(Container container)
         {
-            return $"{ResultToString(container.Result)} {ContainerItemToString(container.Type, container.Item)}";
+            return $"{ResultToString(container.Result)} {container.Name}";
         }
 
         internal static string ContainerInfoToString(ContainerInfo containerInfo)

diff --git a/src/functions/TestResults.NUnit3.ps1 b/src/functions/TestResults.NUnit3.ps1
@@ -19,7 +19,7 @@ function Write-NUnit3Report([Pester.Run] $Result, [System.Xml.XmlWriter] $XmlWri
 }
 
 function Write-NUnit3TestRunAttributes {
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns','')]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '')]
     param([Pester.Run] $Result, [System.Xml.XmlWriter] $XmlWriter)
 
     $XmlWriter.WriteAttributeString('id', '0')