move stacktrace test utils to its own file (#35)

Author: vaind

tests/stacktrace.tests.ps1

@@ -1,13 +1,24 @@
 BeforeAll {
     . "$PSScriptRoot/utils.ps1"
+    . "$PSScriptRoot/throwing.ps1"
     $events = [System.Collections.Generic.List[Sentry.SentryEvent]]::new();
     $transport = [RecordingTransport]::new()
     StartSentryForEventTests ([ref] $events) ([ref] $transport)
 
+    function ContextLines($start, $lines, $path = $null)
+    {
+        if ($null -eq $path)
+        {
+            $path = "$PSScriptRoot/throwing.ps1"
+        }
+
+        Get-Content $path | Select-Object -Skip ($start - 1) -First $lines
+    }
+
     $checkFrame = {
         param([Sentry.SentryStackFrame] $frame, [string] $funcName, [int] $funcLine)
         $frame.Function | Should -Be $funcName
-        $frame.AbsolutePath | Should -Be (Join-Path $PSScriptRoot 'utils.ps1')
+        $frame.AbsolutePath | Should -Be (Join-Path $PSScriptRoot 'throwing.ps1')
         $frame.LineNumber | Should -BeGreaterThan 0
         $frame.InApp | Should -Be $true
         $frame.PreContext  | Should -Be (ContextLines -Start ($funcLine - 5) -Lines 5)
@@ -28,26 +39,26 @@ BeforeAll {
 
         if ($event.SentryExceptions[1].Type -eq 'Write-Error')
         {
-            $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 46)
+            $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 18)
             $event.SentryExceptions[0].Type | Should -Be 'Microsoft.PowerShell.Commands.WriteErrorException'
             $event.SentryExceptions[0].Module | Should -Match 'Microsoft.PowerShell.Commands.Utility'
         }
         else
         {
             if ($event.SentryExceptions[1].Type -eq 'error')
             {
-                $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 45)
+                $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 17)
                 $(GetListItem $frames -1).ColumnNumber | Should -BeGreaterThan 0
             }
             else
             {
-                $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 52)
+                $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 24)
             }
             $event.SentryExceptions[0].Type | Should -Be 'System.Management.Automation.RuntimeException'
             $event.SentryExceptions[0].Module | Should -Match 'System.Management.Automation'
         }
 
-        $checkFrame.Invoke((GetListItem $frames -2), 'funcA', 35)
+        $checkFrame.Invoke((GetListItem $frames -2), 'funcA', 7)
 
         $event.SentryExceptions[0].Value | Should -Be 'error'
         if ($event.SentryExceptions[1].Type -eq 'error,funcB')
@@ -88,8 +99,8 @@ Describe 'Out-Sentry' {
         $event.SentryThreads.Count | Should -Be 2
         [Sentry.SentryStackFrame[]] $frames = $event.SentryThreads[0].Stacktrace.Frames
         $frames.Count | Should -BeGreaterThan 0
-        $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 47)
-        $checkFrame.Invoke((GetListItem $frames -2), 'funcA', 35)
+        $checkFrame.Invoke((GetListItem $frames -1), 'funcB', 19)
+        $checkFrame.Invoke((GetListItem $frames -2), 'funcA', 7)
 
         # A module-based frame should be in-app=false
         $frames | Where-Object -Property Module | Select-Object -First 1 -ExpandProperty 'InApp' | Should -Be $false

tests/throwing.ps1

@@ -0,0 +1,33 @@
+# This file is used in stacktrace tests.
+# Changes here may require changes in tests/stacktrace.test.ps1
+# Especially in the contexts-lines checks.
+
+function funcA($action, $param)
+{
+    funcB $action $param
+}
+
+function funcB
+{
+    [CmdletBinding()]
+    param([string]$action, [string] $value)
+
+    switch ($action)
+    {
+        'throw' { throw $value }
+        'write' { Write-Error $value -ErrorAction Stop }
+        'pass' { $value | Out-Sentry }
+        'pipeline'
+        {
+            try
+            {
+                throw $value
+            }
+            catch
+            {
+                [System.Management.Automation.ErrorRecord]$ErrorRecord = $_
+                $PSCmdlet.ThrowTerminatingError($ErrorRecord)
+            }
+        }
+    }
+}

tests/utils.ps1

@@ -30,46 +30,6 @@ class TestIntegration : Sentry.Integrations.ISdkIntegration
     }
 }
 
-function funcA($action, $param)
-{
-    funcB $action $param
-}
-
-function funcB
-{
-    [CmdletBinding()]
-    param([string]$action, [string] $value)
-
-    switch ($action)
-    {
-        'throw' { throw $value }
-        'write' { Write-Error $value -ErrorAction Stop }
-        'pass' { $value | Out-Sentry }
-        'pipeline'
-        {
-            try
-            {
-                throw $value
-            }
-            catch
-            {
-                [System.Management.Automation.ErrorRecord]$ErrorRecord = $_
-                $PSCmdlet.ThrowTerminatingError($ErrorRecord)
-            }
-        }
-    }
-}
-
-function ContextLines($start, $lines, $path = $null)
-{
-    if ($null -eq $path)
-    {
-        $path = $PSCommandPath
-    }
-
-    Get-Content $path | Select-Object -Skip ($start - 1) -First $lines
-}
-
 function StartSentryForEventTests([ref] $events, [ref] $transport)
 {
     Start-Sentry {