Add tests and correct typo

Author: yutingc

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -275,7 +275,7 @@ private void AnalyzeFile(string filePath)
             // Use a List of KVP rather than dictionary, since for a script containing inline functions with same signature, keys clash
             List<KeyValuePair<CommandInfo, IScriptExtent>> cmdInfoTable = new List<KeyValuePair<CommandInfo, IScriptExtent>>();
 
-            //Check wild card input for the Include/ExcludRules and create regex match patterns
+            //Check wild card input for the Include/ExcludeRules and create regex match patterns
             List<Regex> includeRegexList = new List<Regex>();
             List<Regex> excludeRegexList = new List<Regex>();
             if (includeRule != null)
@@ -358,6 +358,7 @@ private void AnalyzeFile(string filePath)
                         if (exclude.IsMatch(scriptRule.GetName()))
                         {
                             excludeRegexMatch = true;
+                            break;
                         }
                     }
                     if ((includeRule == null || includeRule.Contains(scriptRule.GetName(), StringComparer.OrdinalIgnoreCase) || includeRegexMatch) && 
@@ -433,6 +434,7 @@ private void AnalyzeFile(string filePath)
                         if (exclude.IsMatch(commandRule.GetName()))
                         {
                             excludeRegexMatch = true;
+                            break;
                         }
                     }
                     if ((includeRule == null || includeRule.Contains(commandRule.GetName(), StringComparer.OrdinalIgnoreCase) || includeRegexMatch) &&
@@ -480,6 +482,7 @@ private void AnalyzeFile(string filePath)
                         if (exclude.IsMatch(tokenRule.GetName()))
                         {
                             excludeRegexMatch = true;
+                            break;
                         }
                     }
                     if ((includeRule == null || includeRule.Contains(tokenRule.GetName(), StringComparer.OrdinalIgnoreCase) || includeRegexMatch) && 
@@ -524,6 +527,7 @@ private void AnalyzeFile(string filePath)
                         if (exclude.IsMatch(dscResourceRule.GetName()))
                         {
                             excludeRegexMatch = true;
+                            break;
                         }
                     }
                     if ((includeRule == null || includeRule.Contains(dscResourceRule.GetName(), StringComparer.OrdinalIgnoreCase) || includeRegexMatch) &&

Tests/Engine/InvokeScriptAnalyzer.tests.ps1

@@ -3,6 +3,8 @@ $sa = Get-Command Invoke-ScriptAnalyzer
 $directory = Split-Path -Parent $MyInvocation.MyCommand.Path
 $singularNouns = "PSUseSingularNouns"
 $rules = $singularNouns, "PSUseApprovedVerbs"
+$avoidRules = "PSAvoid*"
+$useRules = "PSUse*"
 
 Describe "Test available parameters" {
     $params = $sa.Parameters
@@ -103,6 +105,12 @@ Describe "Test ExcludeRule" {
         }
     }
 
+    Context "Support wild card" {
+        It "supports wild card exclusions of input rules"{
+            $excludeWildCard = Invoke-ScriptAnalyzer $directory\..\Rules\BadCmdlet.ps1 -ExcludeRule $avoidRules | Where-Object {$_.RuleName -match $avoidRules}
+        }
+    }
+
 }
 
 Describe "Test IncludeRule" {
@@ -124,6 +132,18 @@ Describe "Test IncludeRule" {
             $wrongInclude.Count | Should Be 0
         }
     }
+
+    Context "IncludeRule supports wild card" {
+        It "includes 1 wildcard rule"{
+            $includeWildcard = Invoke-ScriptAnalyzer $directory\..\Rules\BadCmdlet.ps1 -IncludeRule $avoidRules
+            $includeWildcard.Count | Should be 5
+        }
+
+        it "includes 2 wildcardrules" {
+            $includeWildcard = Invoke-ScriptAnalyzer $directory\..\Rules\BadCmdlet.ps1 -IncludeRule $avoidRules, $useRules 
+            $includeWildcard.Count | Should be 7
+        }
+    }
 }
 
 Describe "Test Exclude And Include" {