Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2026-08-23 08:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance app removal verification and error reporting (#735)

Browse Source
This commit is contained in:
Jeffrey
2026-08-12 15:56:29 +02:00
committed by GitHub
parent 9505a5a374
commit d1338cd027
16 changed files with 328 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/Get-WingetInstalledApps.Tests.ps1
+21 -4
View File
@@ -37,16 +37,33 @@ Describe 'Get-WingetInstalledApps' {
Should -Invoke Invoke-NonBlocking -Times 1 -Exactly
}
It 'returns an empty collection when winget output has no table separator' {
It 'returns null when winget output has no table separator' {
$script:WingetTestJob = New-WingetTestJob
Mock Start-Job { $script:WingetTestJob }
Mock Wait-Job { $script:WingetTestJob }
Mock Receive-Job { @('Name Id', 'No parseable table') }
@(Get-WingetInstalledApps) | Should -BeNullOrEmpty
Get-WingetInstalledApps | Should -BeNullOrEmpty
Should -Invoke Remove-Job -Times 1 -Exactly -ParameterFilter { -not $Force }
}
It 'returns an empty collection for a valid table with no data rows' {
$script:WingetTestJob = New-WingetTestJob
Mock Start-Job { $script:WingetTestJob }
Mock Wait-Job { $script:WingetTestJob }
Mock Receive-Job {
@(
'Name Id Version'
'-----------------------------------------------------------------------'
)
}
$result = @(Get-WingetInstalledApps)
$result | Should -HaveCount 1
@($result[0]).Count | Should -Be 0
}
It 'parses valid rows and skips malformed rows' {
$script:WingetTestJob = New-WingetTestJob
Mock Start-Job { $script:WingetTestJob }
@@ -61,7 +78,7 @@ Describe 'Get-WingetInstalledApps' {
)
}
$result = @(Get-WingetInstalledApps)
$result = @(Get-WingetInstalledApps)[0]
$result | Should -HaveCount 2
$result.Id | Should -Be @('Contoso.App', 'Fabrikam.Tools')
@@ -80,7 +97,7 @@ Describe 'Get-WingetInstalledApps' {
)
}
$result = @(Get-WingetInstalledApps)
$result = @(Get-WingetInstalledApps)[0]
$result | Should -HaveCount 2
$result[0].Name | Should -Be 'Contoso hulpmiddel voor gegevens'
Tests/Invoke-Changes.Tests.ps1
+24 -1
View File
@@ -325,6 +325,7 @@ Describe 'Invoke-AllChanges' {
Mock Invoke-ApplyFeatures {}
Mock Invoke-UndoFeatures {}
Mock Write-Host {}
Mock Write-Warning {}
}
It 'backs up registry work before applying and undoing selected features' {
@@ -407,6 +408,28 @@ Describe 'Invoke-AllChanges' {
Invoke-AllChanges
Should -Invoke Write-Host -Times 1 -Exactly -ParameterFilter { $Object -match '2 registry import change' }
Should -Invoke Write-Warning -Times 1 -Exactly -ParameterFilter { $Message -match '2 registry import change' }
}
It 'reports app removal failures after all requested work completes' {
$script:Params = @{ CustomApply = $true }
$script:UndoParams = @{}
Mock Invoke-ApplyFeatures { $script:AppRemovalFailures = 2 }
Invoke-AllChanges
Should -Invoke Write-Warning -Times 1 -Exactly -ParameterFilter { $Message -match '2 app removal\(s\) failed' }
}
It 'warns when app removals could not be verified' {
$script:Params = @{ CustomApply = $true }
$script:UndoParams = @{}
Mock Invoke-ApplyFeatures { $script:AppRemovalVerificationUnavailable = $true }
Mock Write-Warning {}
Invoke-AllChanges
Should -Invoke Write-Warning -Times 1 -Exactly -ParameterFilter { $Message -eq 'Unable to verify if all apps were uninstalled successfully.' }
}
}
Tests/Remove-SelectedApps.Tests.ps1
+83 -39
View File
@@ -1,6 +1,6 @@
BeforeAll {
function Get-TargetUserForAppRemoval { 'AllUsers' }
function Get-WingetInstalledApps { param($TimeOut, [switch]$NonBlocking) @() }
function Get-WingetInstalledApps { param($TimeOut, [switch]$NonBlocking) return ,@() }
function Test-AppInWingetList { param($appId, $InstalledList) $false }
function Invoke-NonBlocking { param($ScriptBlock, $ArgumentList, $TimeoutSeconds) }
function Get-UserName { 'Alice' }
@@ -8,6 +8,7 @@ BeforeAll {
function Show-MessageBox { 'No' }
function Invoke-WithTargetUserHive { param($TargetUserName, $ScriptBlock, $ArgumentObject) }
function Invoke-RegistryOperation { param($Operation, $RegFilePath) }
function Resolve-UserProfileContext { param($UserName) $null }
. (Join-Path $PSScriptRoot '..\Scripts\AppRemoval\Remove-SelectedApps.ps1')
}
@@ -18,12 +19,14 @@ Describe 'Remove-SelectedApps' {
$script:CancelRequested = $false
$script:ApplySubStepCallback = $null
$script:WingetInstalled = $true
$script:AppRemovalFailures = 0
$script:AppRemovalVerificationUnavailable = $false
Mock Get-TargetUserForAppRemoval { 'AllUsers' }
Mock Get-AppRemovalMethod { 'Appx' }
Mock Remove-WinGetApp {}
Mock Remove-AppxApp {}
Mock Test-AppStillInstalled { $false }
Mock Get-WingetInstalledApps { @() }
Mock Remove-WinGetApp { $true }
Mock Remove-AppxApp { $true }
Mock Test-AppInWingetList { $false }
Mock Get-WingetInstalledApps { return ,@() }
Mock Request-EdgeForceRemove {}
Mock Write-Host {}
}
@@ -43,6 +46,13 @@ Describe 'Remove-SelectedApps' {
Should -Invoke Remove-AppxApp -Times 1 -Exactly -ParameterFilter { $app -eq 'Appx.App' -and $targetUser -eq 'AllUsers' }
}
It 'verifies WinGet removals against the fetched Winget list' {
Mock Get-AppRemovalMethod { 'WinGet' }
Mock Get-WingetInstalledApps { return ,@([PSCustomObject]@{ Id = 'Other.App' }) }
Remove-SelectedApps -appsList @('Winget.App')
Should -Invoke Test-AppInWingetList -Times 1 -Exactly -ParameterFilter { $appId -eq 'Winget.App' -and $InstalledList[0].Id -eq 'Other.App' }
}
It 'stops before the first removal when cancellation is requested' {
$script:CancelRequested = $true
Remove-SelectedApps -appsList @('One.App')
@@ -50,9 +60,45 @@ Describe 'Remove-SelectedApps' {
Should -Invoke Remove-AppxApp -Times 0 -Exactly
}
It 'counts failed Appx removals and reports them' {
Mock Remove-AppxApp { $false }
Remove-SelectedApps -appsList @('One.App')
$script:AppRemovalFailures | Should -Be 1
}
It 'counts a failed WinGet removal' {
Mock Get-AppRemovalMethod { 'WinGet' }
Mock Remove-WinGetApp { $false }
Remove-SelectedApps -appsList @('One.App')
$script:AppRemovalFailures | Should -Be 1
}
It 'counts a WinGet removal that remains installed after a successful command' {
Mock Get-AppRemovalMethod { 'WinGet' }
Mock Test-AppInWingetList { $true }
Remove-SelectedApps -appsList @('One.App')
$script:AppRemovalFailures | Should -Be 1
}
It 'records an unavailable WinGet inventory as an unverified removal' {
Mock Get-AppRemovalMethod { 'WinGet' }
Mock Get-WingetInstalledApps { $null }
Remove-SelectedApps -appsList @('One.App')
$script:AppRemovalVerificationUnavailable | Should -BeTrue
Should -Invoke Test-AppInWingetList -Times 0 -Exactly
}
It 'prompts for forced Edge removal at most once after failed winget removals' {
Mock Get-AppRemovalMethod { 'WinGet' }
Mock Test-AppStillInstalled { $true }
Mock Test-AppInWingetList { $true }
Remove-SelectedApps -appsList @('Microsoft.Edge', 'XPFFTQ037JWMHS')
Should -Invoke Request-EdgeForceRemove -Times 1 -Exactly
}
@@ -86,15 +132,16 @@ Describe 'Remove-WinGetApp' {
BeforeEach {
$script:Params = @{}
$script:WingetInstalled = $true
Mock Invoke-NonBlocking {}
Mock Set-RunOnceWingetTask {}
Mock Invoke-NonBlocking { $true }
Mock Set-RunOnceWingetTask { $true }
Mock Get-UserName { 'Alice' }
Mock Write-Host {}
Mock Write-Error {}
}
It 'reports unavailable winget without invoking or scheduling removal' {
$script:WingetInstalled = $false
Remove-WinGetApp -app 'One.App'
Remove-WinGetApp -app 'One.App' | Should -BeFalse
Should -Invoke Invoke-NonBlocking -Times 0 -Exactly
Should -Invoke Set-RunOnceWingetTask -Times 0 -Exactly
}
@@ -130,55 +177,52 @@ Describe 'Remove-WinGetApp' {
{ Remove-WinGetApp -app 'One.App' } | Should -Not -Throw
Should -Invoke Set-RunOnceWingetTask -Times 1 -Exactly
Should -Invoke Write-Host -Times 1 -Exactly -ParameterFilter {
$Object -like '*did not complete within 120 seconds*' -and $ForegroundColor -eq 'Red'
Should -Invoke Write-Error -Times 1 -Exactly -ParameterFilter {
$Message -like '*did not complete within 120 seconds*'
}
}
}
Describe 'Remove-AppxApp' {
BeforeEach { Mock Invoke-NonBlocking {} }
BeforeEach { Mock Invoke-NonBlocking { [PSCustomObject]@{ Success = $true } } }
It 'passes the wildcard and target user data for <Target>' -ForEach @(
@{ Target = 'AllUsers'; ExpectedArguments = 1 }
@{ Target = 'CurrentUser'; ExpectedArguments = 1 }
@{ Target = 'Alice'; ExpectedArguments = 2 }
@{ Target = 'AllUsers' }
@{ Target = 'CurrentUser' }
@{ Target = 'Alice' }
) {
Remove-AppxApp -app 'One.App' -targetUser $Target
Should -Invoke Invoke-NonBlocking -Times 1 -Exactly -ParameterFilter {
@($ArgumentList).Count -eq $ExpectedArguments -and @($ArgumentList)[0] -eq '*One.App*' -and
($ExpectedArguments -eq 1 -or @($ArgumentList)[1] -eq 'Alice')
@($ArgumentList).Count -eq 2 -and @($ArgumentList)[0] -eq '*One.App*' -and @($ArgumentList)[1] -eq $Target
}
}
}
Describe 'Test-AppStillInstalled' {
BeforeEach {
$script:WingetInstalled = $true
Mock Get-AppxPackage { $null }
Mock Test-AppInWingetList { $false }
Mock Get-WingetInstalledApps { @() }
Mock Write-Warning {}
It 'returns false when package discovery reports a non-terminating error' {
Mock Invoke-NonBlocking { param($ScriptBlock, $ArgumentList) & $ScriptBlock @ArgumentList }
Mock Get-AppxPackage { Write-Error 'access denied' }
Remove-AppxApp -app 'One.App' -targetUser 'CurrentUser' | Should -BeFalse
}
It 'prefers all-user Appx detection and avoids winget lookup' {
Mock Get-AppxPackage { [PSCustomObject]@{ Name = 'One.App' } }
Test-AppStillInstalled -appId 'One.App' | Should -BeTrue
Should -Invoke Get-AppxPackage -Times 1 -Exactly -ParameterFilter { $AllUsers }
Should -Invoke Get-WingetInstalledApps -Times 0 -Exactly
It 'returns false when package removal reports a non-terminating error' {
Mock Invoke-NonBlocking { param($ScriptBlock, $ArgumentList) & $ScriptBlock @ArgumentList }
Mock Get-AppxPackage { [PSCustomObject]@{ PackageFullName = 'One.App_1.0' } }
Mock Remove-AppxPackage { Write-Error 'access denied' }
Remove-AppxApp -app 'One.App' -targetUser 'CurrentUser' | Should -BeFalse
}
It 'uses a supplied winget list without launching a live query' {
Mock Test-AppInWingetList { $true }
Test-AppStillInstalled -appId 'One.App' -InstalledList @([PSCustomObject]@{ Id = 'One.App' }) | Should -BeTrue
Should -Invoke Get-WingetInstalledApps -Times 0 -Exactly
It 'returns false and reports a terminating Appx failure' {
Mock Invoke-NonBlocking { throw 'access denied' }
Mock Write-Error {}
Remove-AppxApp -app 'One.App' -targetUser 'CurrentUser' | Should -BeFalse
Should -Invoke Write-Error -Times 1 -Exactly -ParameterFilter {
$Message -like '*Unable to remove One.App via Appx*access denied*'
}
}
It 'warns when a non-Appx app cannot be verified without winget' {
$script:WingetInstalled = $false
Test-AppStillInstalled -appId 'One.App' | Should -BeFalse
Should -Invoke Write-Warning -Times 1 -Exactly
}
}
Describe 'Set-RunOnceWingetTask' {
Tests/Wait-ForKeyPress.Tests.ps1
+10
View File
@@ -8,4 +8,14 @@ Describe 'Wait-ForKeyPress' {
$LASTEXITCODE | Should -Be 0
}
It 'uses the requested exit code' {
$scriptPath = Join-Path $PSScriptRoot '..\Scripts\CLI\Wait-ForKeyPress.ps1'
$command = "function Stop-Transcript {}; `$global:Silent = `$true; . '$scriptPath'; Wait-ForKeyPress -ExitCode 1"
$encodedCommand = [Convert]::ToBase64String([Text.Encoding]::Unicode.GetBytes($command))
& powershell.exe -NoProfile -EncodedCommand $encodedCommand
$LASTEXITCODE | Should -Be 1
}
}