Fix line number tests

Author: Jaykul

Tests/Public/Convert-CodeCoverage.Tests.ps1

@@ -1,4 +1,15 @@
-Describe "Convert-CodeCoverage"
+Describe "Convert-CodeCoverage" {
+
+    $ModulePath = Join-Path (Get-Module ModuleBuilder).ModuleBase ModuleBuilder.psm1
+    $ModuleRoot = Resolve-Path "$PSScriptRoot\..\..\Source"
+
+    $ModuleFiles = Get-ChildItem $ModuleRoot -File -Recurse -Filter *.ps1
+    $ModuleSource = Get-Content $ModulePath
+
+    $lineNumber = Get-Random -min 2 -max $ModuleSource.Count
+    while($ModuleSource[$lineNumber] -match "^#(END)?REGION") {
+        $lineNumber += 5
+    }
 
     It 'Should extract code coverage from Pester objects and add Source conversions' {
 
@@ -16,10 +27,9 @@ Describe "Convert-CodeCoverage"
             }
         }
 
-        $SourceLocation = $PesterResults | Convert-CodeCoverage
+        $SourceLocation = $PesterResults | Convert-CodeCoverage -SourceRoot $ModuleRoot
 
         $SourceLocation.SourceFile | Should -Be ".\Private\CopyReadme.ps1"
-        $SourceLocation.SourceLineNumber | Should -Be 24
-        $SourceLocation.Function | Should -Be 'CopyReadme'
+        $SourceLocation.Line | Should -Be 24
     }
 }

Tests/Public/Convert-LineNumber.Tests.ps1

@@ -10,11 +10,11 @@ Describe "Convert-LineNumber" {
     for($i=0; $i -lt 5; $i++) {
 
         $lineNumber = Get-Random -min 2 -max $ModuleSource.Count
-        while($ModuleSource[$lineNumber] -match "^#(END)?REGION") {
+        while($ModuleSource[$lineNumber] -match "^\s*$|^#(END)?REGION") {
             $lineNumber += 5
         }
 
-        It 'Should map line number $lineNumber in the Module to the matching line the Source' {
+        It "Should map line number $lineNumber in the Module to the matching line the Source" {
             $SourceLocation = Convert-LineNumber $ModulePath $lineNumber
 
             $line = (Get-Content (Join-Path $ModuleRoot $SourceLocation.SourceFile))[$SourceLocation.SourceLineNumber]
@@ -30,7 +30,6 @@ Describe "Convert-LineNumber" {
         $line = Select-String -Path $ModulePath 'function ParseLineNumber {' | % LineNumber
 
         $SourceLocation = "At ${ModulePath}:$line char:17" | Convert-LineNumber
-        Write-Verbose "At ${ModulePath}:$line char:17" -Verbose
         $SourceLocation.SourceFile | Should -Be ".\Private\ParseLineNumber.ps1"
         $SourceLocation.SourceLineNumber | Should -Be 1
     }
@@ -56,7 +55,6 @@ Describe "Convert-LineNumber" {
         }
 
         $SourceLocation = $PesterMiss | Convert-LineNumber -Passthru
-
         $SourceLocation.SourceFile | Should -Be ".\Private\CopyReadme.ps1"
         $SourceLocation.SourceLineNumber | Should -Be 24
         $SourceLocation.Function | Should -Be 'CopyReadme'