Measure AfterAll and AfterEach as UserDuration (#2313)

Author: fflaten

src/Pester.Runtime.ps1

@@ -1486,6 +1486,7 @@ function Invoke-ScriptBlock {
                 finally {
                     if ($null -ne $______parameters.Teardown -and $______parameters.Teardown.Length -gt 0) {
                         if ($______parameters.EnableWriteDebug) { &$______parameters.WriteDebug "Running inner teardowns" }
+                        if ($______parameters.MoveBetweenScopes) { & $______parameters.SwitchTimerUserCode }
                         foreach ($______current in $______parameters.Teardown) {
                             try {
                                 if ($______parameters.EnableWriteDebug) { &$______parameters.WriteDebug "Running inner teardown { $______current }" }
@@ -1516,6 +1517,7 @@ function Invoke-ScriptBlock {
 
             if ($null -ne $______parameters.OuterTeardown -and $______parameters.OuterTeardown.Length -gt 0) {
                 if ($______parameters.EnableWriteDebug) { &$______parameters.WriteDebug "Running outer teardowns" }
+                if ($______parameters.MoveBetweenScopes) { & $______parameters.SwitchTimerUserCode }
                 foreach ($______current in $______parameters.OuterTeardown) {
                     try {
                         if ($______parameters.EnableWriteDebug) { &$______parameters.WriteDebug "Running outer teardown { $______current }" }
@@ -1556,6 +1558,13 @@ function Invoke-ScriptBlock {
         }
     }
 
+    $switchTimerUserCode = if ($MoveBetweenScopes) {
+        {
+            $state.UserCodeStopWatch.Start()
+            $state.FrameworkStopWatch.Stop()
+        }
+    }
+
     #$break = $true
     $err = $null
     try {
@@ -1573,6 +1582,8 @@ function Invoke-ScriptBlock {
             WriteDebug                    = $writeDebug
             Configuration                 = $Configuration
             NoNewScope                    = $NoNewScope
+            MoveBetweenScopes             = $MoveBetweenScopes
+            SwitchTimerUserCode           = $switchTimerUserCode
         }
 
         # here we are moving into the user scope if the provided

test.ps1

@@ -62,8 +62,8 @@ Get-Module Pester | Remove-Module
 
 if (-not $SkipPTests) {
     $result = @(Get-ChildItem $PSScriptRoot/tst/*.ts.ps1 -Recurse |
-            foreach {
-                $r = & $_.FullName -PassThru -NoBuild:$NoBuild
+            ForEach-Object {
+                $r = & $_.FullName -PassThru -NoBuild:$true
                 if ($r.Failed -gt 0) {
                     [PSCustomObject]@{
                         FullName = $_.FullName

tst/Pester.Runtime.ts.ps1

@@ -2234,8 +2234,6 @@ i -PassThru:$PassThru {
 
 
         t "total time is roughly the same as time measured externally (measured on a second test)" {
-            # this is the same as above, if I add one time setups then the framework time should grow
-            # but not the user code time
             $container = @{
                 Test   = $null
                 Block  = $null
@@ -2298,8 +2296,6 @@ i -PassThru:$PassThru {
         }
 
         t "total time is roughly the same as time measured externally (on many tests)" {
-            # this is the same as above, if I add one time setups then the framework time should grow
-            # but not the user code time
             $container = @{
                 Test   = $null
                 Block  = $null
@@ -2357,6 +2353,54 @@ i -PassThru:$PassThru {
 
             # TODO: revisit the difference on many tests, it is still missing some parts of the common discovery processing I guess (replicates on 10k tests)
         }
+
+        t "OneTimeTestSetup and OneTimeTestTeardown is measured as user code in block" {
+            $actual = Invoke-Test -SessionState $ExecutionContext.SessionState -BlockContainer (
+                New-BlockContainerObject -ScriptBlock {
+                    New-Block -Name 'b1' {
+                        New-OneTimeTestSetup {
+                            Start-Sleep -Milliseconds 50
+                        }
+                        New-OneTimeTestTeardown {
+                            Start-Sleep -Milliseconds 50
+                        }
+                        New-Test 't1' {
+                            $true
+                        }
+                    }
+                }
+            )
+
+            $actual.UserDuration.TotalMilliseconds -ge 100 | Verify-True
+            $actual.Blocks[0].UserDuration.TotalMilliseconds -ge 100 | Verify-True
+            $actual.Blocks[0].OwnDuration.TotalMilliseconds -ge 100 | Verify-True
+            # test should not include time spent in block setup/teardown
+            $actual.Blocks[0].Tests[0].UserDuration.TotalMilliseconds -lt 100 | Verify-True
+        }
+
+        t "EachTestSetup and EachTestTeardown is measured as user code in test" {
+            $actual = Invoke-Test -SessionState $ExecutionContext.SessionState -BlockContainer (
+                New-BlockContainerObject -ScriptBlock {
+                    New-Block -Name 'b1' {
+                        New-EachTestSetup {
+                            Start-Sleep -Milliseconds 50
+                        }
+                        New-EachTestTeardown {
+                            Start-Sleep -Milliseconds 50
+                        }
+                        New-Test 't1' {
+                            $true
+                        }
+                    }
+                }
+            )
+
+            $actual.UserDuration.TotalMilliseconds -ge 100 | Verify-True
+            $actual.Blocks[0].UserDuration.TotalMilliseconds -ge 100 | Verify-True
+            # block is not responsible for setup/teardown per test.
+            $actual.Blocks[0].OwnDuration.TotalMilliseconds -lt 100 | Verify-True
+            $actual.Blocks[0].Tests[0].UserDuration.TotalMilliseconds -ge 100 | Verify-True
+        }
     }
 
     b "Setup and Teardown on root block" {