Merge branch 'XPath' into BugFixes

Author: yutingc

Rules/AvoidUsingInternalURLs.cs

@@ -44,6 +44,26 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
             {
                 foreach (StringConstantExpressionAst expressionAst in expressionAsts)
                 {
+                    //Check if XPath is used. If XPath is used, then we don't throw warnings.
+                    Ast parentAst = expressionAst.Parent;
+                    if (parentAst is InvokeMemberExpressionAst)
+                    {
+                        InvokeMemberExpressionAst invocation = parentAst as InvokeMemberExpressionAst;
+                        if (invocation != null)
+                        {
+                            if (String.Equals(invocation.Member.ToString(), "SelectSingleNode",StringComparison.OrdinalIgnoreCase) ||
+                                String.Equals(invocation.Member.ToString(), "SelectNodes",StringComparison.OrdinalIgnoreCase) ||
+                                String.Equals(invocation.Member.ToString(), "Select", StringComparison.OrdinalIgnoreCase) ||
+                                String.Equals(invocation.Member.ToString(), "Evaluate",StringComparison.OrdinalIgnoreCase) ||
+                                String.Equals(invocation.Member.ToString(), "Matches",StringComparison.OrdinalIgnoreCase))
+                            {
+                                continue;
+                            }
+
+                        }
+                    }
+
+
                     bool isPathValid = false;
                     bool isInternalURL = false;
                     //make sure there is no path 
@@ -128,7 +148,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
                                 new DiagnosticRecord(
                                     String.Format(CultureInfo.CurrentCulture, Strings.AvoidUsingInternalURLsError,
                                         expressionAst.Value), expressionAst.Extent,
-                                    GetName(), DiagnosticSeverity.Warning, fileName);
+                                    GetName(), DiagnosticSeverity.Information, fileName);
 
                         }
                     }
@@ -177,7 +197,7 @@ public SourceType GetSourceType()
         /// <returns></returns>
         public RuleSeverity GetSeverity()
         {
-            return RuleSeverity.Warning;
+            return RuleSeverity.Information;
         }
 
         /// <summary>

Tests/Engine/GetScriptAnalyzerRule.tests.ps1

@@ -118,7 +118,7 @@ Describe "TestSeverity" {
 
     It "filters rules based on multiple severity inputs"{
         $rules = Get-ScriptAnalyzerRule -Severity Error,Information
-        $rules.Count | Should be 9
+        $rules.Count | Should be 13
     }
 
         It "takes lower case inputs" {
@@ -130,11 +130,11 @@ Describe "TestSeverity" {
 Describe "TestWildCard" {
     It "filters rules based on the -Name wild card input" {
         $rules = Get-ScriptAnalyzerRule -Name PSDSC*
-        $rules.Count | Should be 4
+        $rules.Count | Should be 6
     }
 
     It "filters rules based on wild card input and severity"{
         $rules = Get-ScriptAnalyzerRule -Name PSDSC*　-Severity Information
-        $rules.Count | Should be 1
+        $rules.Count | Should be 3
     }
 }

Tests/Engine/InvokeScriptAnalyzer.tests.ps1

@@ -141,7 +141,7 @@ Describe "Test IncludeRule" {
 
         it "includes 2 wildcardrules" {
             $includeWildcard = Invoke-ScriptAnalyzer $directory\..\Rules\BadCmdlet.ps1 -IncludeRule $avoidRules, $useRules 
-            $includeWildcard.Count | Should be 7
+            $includeWildcard.Count | Should be 9
         }
     }
 }

Tests/Rules/AvoidUsingInternalURLs.ps1

@@ -3,4 +3,4 @@ $internalSite = "//msw"
 $externalSite = "http:\\msw"
 if (-not $scratch.EndsWith("/")) {
 	$scratch += "/";
-}
+}

Tests/Rules/AvoidUsingInternalURLsNoViolations.ps1

@@ -1,4 +1,8 @@
 $correctPath = "www.bing.com"
 $externalSite = "//outside.co/test"
 rmdir /s /q ".\Directory"
+function Test
+{
+	$filesNode = $infoXml.SelectSingleNode("//files")
+}
 $sd = "O:BAG:BAD:(A;;0x800;;;WD)(A;;0x120fff;;;SY)(A;;0x120fff;;;LS)(A;;0x120fff;;;NS)(A;;0x120fff;;;BA)(A;;0xee5;;;LU)(A;;LC;;;MU)(A;;0x800;;;AG)"