Tweaked format

This commit is contained in:
dfinke
2020-03-16 13:39:03 -04:00
parent 6a32da7f92
commit 933abf6539

View File

@@ -1,34 +1,34 @@
[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectComparisonWithNull','',Justification='Intentional use to select non null array items')] [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectComparisonWithNull', '', Justification = 'Intentional use to select non null array items')]
[CmdletBinding(DefaultParameterSetName = 'Default')] [CmdletBinding(DefaultParameterSetName = 'Default')]
param( param(
[Parameter(Position=0)] [Parameter(Position = 0)]
[string]$XLFile, [string]$XLFile,
[Parameter(ParameterSetName='Default',Position=1)] [Parameter(ParameterSetName = 'Default', Position = 1)]
[Alias('Path', 'relative_path')] [Alias('Path', 'relative_path')]
[object[]]$Script = '.', [object[]]$Script = '.',
[Parameter(ParameterSetName='Existing',Mandatory=$true)] [Parameter(ParameterSetName = 'Existing', Mandatory = $true)]
[switch] [switch]
$UseExisting, $UseExisting,
[Parameter(ParameterSetName='Default', Position=2)] [Parameter(ParameterSetName = 'Default', Position = 2)]
[Parameter(ParameterSetName='Existing',Position=2, Mandatory=$true)] [Parameter(ParameterSetName = 'Existing', Position = 2, Mandatory = $true)]
[string]$OutputFile, [string]$OutputFile,
[Parameter(ParameterSetName='Default')] [Parameter(ParameterSetName = 'Default')]
[Alias("Name")] [Alias("Name")]
[string[]]$TestName, [string[]]$TestName,
[Parameter(ParameterSetName='Default')] [Parameter(ParameterSetName = 'Default')]
[switch]$EnableExit, [switch]$EnableExit,
[Parameter(ParameterSetName='Default')] [Parameter(ParameterSetName = 'Default')]
[Alias('Tags')] [Alias('Tags')]
[string[]]$Tag, [string[]]$Tag,
[string[]]$ExcludeTag, [string[]]$ExcludeTag,
[Parameter(ParameterSetName='Default')] [Parameter(ParameterSetName = 'Default')]
[switch]$Strict, [switch]$Strict,
[string]$WorkSheetName = 'PesterResults', [string]$WorkSheetName = 'PesterResults',
@@ -36,13 +36,13 @@ param(
[switch]$Show [switch]$Show
) )
$InvokePesterParams = @{OutputFormat = 'NUnitXml'} + $PSBoundParameters $InvokePesterParams = @{OutputFormat = 'NUnitXml' } + $PSBoundParameters
if (-not $InvokePesterParams['OutputFile']) { if (-not $InvokePesterParams['OutputFile']) {
$InvokePesterParams['OutputFile'] = Join-Path -ChildPath 'Pester.xml'-Path ([environment]::GetFolderPath([System.Environment+SpecialFolder]::MyDocuments)) $InvokePesterParams['OutputFile'] = Join-Path -ChildPath 'Pester.xml'-Path ([environment]::GetFolderPath([System.Environment+SpecialFolder]::MyDocuments))
} }
if ($InvokePesterParams['Show'] ) {} if ($InvokePesterParams['Show'] ) { }
if ($InvokePesterParams['XLFile']) {$InvokePesterParams.Remove('XLFile')} if ($InvokePesterParams['XLFile']) { $InvokePesterParams.Remove('XLFile') }
else {$XLFile = $InvokePesterParams['OutputFile'] -replace '.xml$','.xlsx'} else { $XLFile = $InvokePesterParams['OutputFile'] -replace '.xml$', '.xlsx' }
if (-not $UseExisting) { if (-not $UseExisting) {
$InvokePesterParams.Remove('Append') $InvokePesterParams.Remove('Append')
$InvokePesterParams.Remove('UseExisting') $InvokePesterParams.Remove('UseExisting')
@@ -60,7 +60,7 @@ $startDate = [datetime]$resultXML.date
$startTime = $resultXML.time $startTime = $resultXML.time
$machine = $resultXML.environment.'machine-name' $machine = $resultXML.environment.'machine-name'
#$user = $resultXML.environment.'user-domain' + '\' + $resultXML.environment.user #$user = $resultXML.environment.'user-domain' + '\' + $resultXML.environment.user
$os = $resultXML.environment.platform -replace '\|.*$'," $($resultXML.environment.'os-version')" $os = $resultXML.environment.platform -replace '\|.*$', " $($resultXML.environment.'os-version')"
<#hierarchy goes <#hierarchy goes
root, [date], start [time], [Name] (always "Pester"), test results broken down as [total],[errors],[failures],[not-run] etc. root, [date], start [time], [Name] (always "Pester"), test results broken down as [total],[errors],[failures],[not-run] etc.
Environment (user & machine info) Environment (user & machine info)
@@ -90,17 +90,18 @@ $testResults = foreach ($test in $resultXML.'test-suite'.results.'test-suite') {
if ($subsuite.results.'test-suite'.results.'test-case') { if ($subsuite.results.'test-suite'.results.'test-case') {
$testCases = $subsuite.results.'test-suite'.results.'test-case' $testCases = $subsuite.results.'test-suite'.results.'test-case'
} }
else {$testCases = $subsuite.results.'test-case'} else { $testCases = $subsuite.results.'test-case' }
$testCases | ForEach-Object { $testCases | ForEach-Object {
New-Object -TypeName psobject -Property ([ordered]@{ New-Object -TypeName psobject -Property ([ordered]@{
Machine = $machine ; OS = $os Machine = $machine ; OS = $os
Date = $startDate ; Time = $startTime Date = $startDate ; Time = $startTime
Executed = $(if ($_.executed -eq 'True') {1}) Executed = $(if ($_.executed -eq 'True') { 1 })
Success = $(if ($_.success -eq 'True') {1}) Success = $(if ($_.success -eq 'True') { 1 })
Duration = $_.time Duration = $_.time
File = $testPs1File; Group = $Describe File = $testPs1File; Group = $Describe
SubGroup = $Context ; Name =($_.Description -replace '\s{2,}', ' ') SubGroup = $Context ; Name = ($_.Description -replace '\s{2,}', ' ')
Result = $_.result ; FullDesc = '=Group&" "&SubGroup&" "&Name'}) Result = $_.result ; FullDesc = '=Group&" "&SubGroup&" "&Name'
})
} }
} }
} }
@@ -108,21 +109,22 @@ $testResults = foreach ($test in $resultXML.'test-suite'.results.'test-suite') {
else { else {
$test.results.'test-suite' | ForEach-Object { $test.results.'test-suite' | ForEach-Object {
$Describe = $_.description $Describe = $_.description
$_.results.'test-case'| ForEach-Object { $_.results.'test-case' | ForEach-Object {
New-Object -TypeName psobject -Property ([ordered]@{ New-Object -TypeName psobject -Property ([ordered]@{
Machine = $machine ; OS = $os Machine = $machine ; OS = $os
Date = $startDate ; Time = $startTime Date = $startDate ; Time = $startTime
Executed = $(if ($_.executed -eq 'True') {1}) Executed = $(if ($_.executed -eq 'True') { 1 })
Success = $(if ($_.success -eq 'True') {1}) Success = $(if ($_.success -eq 'True') { 1 })
Duration = $_.time Duration = $_.time
File = $testPs1File; Group = $Describe File = $testPs1File; Group = $Describe
SubGroup = $null ; Name =($_.Description -replace '\s{2,}', ' ') SubGroup = $null ; Name = ($_.Description -replace '\s{2,}', ' ')
Result = $_.result ; FullDesc = '=Group&" "&Test'}) Result = $_.result ; FullDesc = '=Group&" "&Test'
})
} }
} }
} }
} }
if (-not $testResults) {Write-Warning 'No Results found' ; return} if (-not $testResults) { Write-Warning 'No Results found' ; return }
$clearSheet = -not $Append $clearSheet = -not $Append
$excel = $testResults | Export-Excel -Path $xlFile -WorkSheetname $WorkSheetName -ClearSheet:$clearSheet -Append:$append -PassThru -BoldTopRow -FreezeTopRow -AutoSize -AutoFilter -AutoNameRange $excel = $testResults | Export-Excel -Path $xlFile -WorkSheetname $WorkSheetName -ClearSheet:$clearSheet -Append:$append -PassThru -BoldTopRow -FreezeTopRow -AutoSize -AutoFilter -AutoNameRange
$ws = $excel.Workbook.Worksheets[$WorkSheetName] $ws = $excel.Workbook.Worksheets[$WorkSheetName]
@@ -136,7 +138,7 @@ $ws = $excel.Workbook.Worksheets[$WorkSheetName]
Set-Column -Worksheet $ws -Column 3 -NumberFormat 'Short Date' # -AutoSize Set-Column -Worksheet $ws -Column 3 -NumberFormat 'Short Date' # -AutoSize
#Hide columns E to J (Executed, Success, Duration, File, Group and Subgroup) #Hide columns E to J (Executed, Success, Duration, File, Group and Subgroup)
(5..10) | ForEach-Object {Set-ExcelColumn -Worksheet $ws -Column $_ -Hide } (5..10) | ForEach-Object { Set-ExcelColumn -Worksheet $ws -Column $_ -Hide }
#Use conditional formatting to make Failures red, and Successes green (skipped remains black ) ... and save #Use conditional formatting to make Failures red, and Successes green (skipped remains black ) ... and save
$endRow = $ws.Dimension.End.Row $endRow = $ws.Dimension.End.Row